Skip to content
This repository was archived by the owner on Jan 9, 2025. It is now read-only.

Kwarxs fork #118

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
description = "plutus-simple-model";

inputs = {
haskell-nix.url = "github:input-output-hk/haskell.nix";
haskell-nix.url = "github:input-output-hk/haskell.nix/220f8a9cd166e726aea62843bdafa7ecded3375c"; # TODO
nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
iohk-nix.url = "github:input-output-hk/iohk-nix";
haskell-nix-extra-hackage.url = "github:mlabs-haskell/haskell-nix-extra-hackage/separate-hackages";
iohk-nix.url = "github:input-output-hk/iohk-nix/9a604d01bd4420ab7f396f14d1947fbe2ce7db8b";
haskell-nix-extra-hackage.url = "github:mlabs-haskell/haskell-nix-extra-hackage/ee50d7eb739819efdb27bda9f444e007c12e9833";
haskell-nix-extra-hackage.inputs.haskell-nix.follows = "haskell-nix";
haskell-nix-extra-hackage.inputs.nixpkgs.follows = "nixpkgs";

cardano-base.url = "github:input-output-hk/cardano-base/631cb6cf1fa01ab346233b610a38b3b4cba6e6ab";
cardano-base.url = "github:input-output-hk/cardano-base/0f3a867493059e650cda69e20a5cbf1ace289a57";
cardano-base.flake = false;
cardano-crypto.url = "github:input-output-hk/cardano-crypto/f73079303f663e028288f9f4a9e08bcca39a923e";
cardano-crypto.flake = false;
cardano-ledger.url = "github:input-output-hk/cardano-ledger/389b266d6226dedf3d2aec7af640b3ca4984c5ea";
cardano-ledger.url = "github:input-output-hk/cardano-ledger/3be8a19083fc13d9261b1640e27dd389b51bb08e";
cardano-ledger.flake = false;
cardano-prelude.url = "github:input-output-hk/cardano-prelude/533aec85c1ca05c7d171da44b89341fb736ecfe5";
cardano-prelude.url = "github:input-output-hk/cardano-prelude/bb4ed71ba8e587f672d06edf9d2e376f4b055555";
cardano-prelude.flake = false;
flat.url = "github:Quid2/flat/ee59880f47ab835dbd73bea0847dab7869fc20d8";
flat.flake = false;
goblins.url = "github:input-output-hk/goblins/cde90a2b27f79187ca8310b6549331e59595e7ba";
goblins.flake = false;
weigh.url = "github:fpco/weigh/bfcf4415144d7d2817dfcb91b6f9a6dfd7236de7";
weigh.flake = false;
plutus.url = "github:input-output-hk/plutus/8ab4c3355c5fdf67dcf6acc1f5a14668d5e6f0a9";
plutus.url = "github:input-output-hk/plutus/69ab98c384703172f898eb5bcad1078ded521426";
plutus.flake = false;
Win32-network.url = "github:input-output-hk/Win32-network/3825d3abf75f83f406c1f7161883c438dac7277d";
Win32-network.flake = false;
Expand Down
1 change: 0 additions & 1 deletion plutus-simple-model.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ library
Plutus.Model.Validator.V1.Plutus
Plutus.Model.Validator.V2
Plutus.Model.Validator.V2.Plutus
other-modules:
Plutus.Model.Fork.Cardano.Alonzo
Plutus.Model.Fork.Cardano.Babbage
Plutus.Model.Fork.Cardano.Class
Expand Down
4 changes: 2 additions & 2 deletions src/Plutus/Model/Fork/Cardano/Common.hs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import Cardano.Ledger.Shelley.API.Types qualified as Shelley (Hash)
import Cardano.Ledger.TxIn qualified as C
import Cardano.Ledger.ShelleyMA.Timelocks qualified as C
import Cardano.Ledger.Keys qualified as C
import Cardano.Ledger.Keys.WitVKey
import Cardano.Ledger.Shelley.API.Types (WitVKey, Delegation (Delegation))
import Cardano.Ledger.Shelley.UTxO qualified as C
import qualified Cardano.Crypto.Hash.Class as Crypto
import Cardano.Ledger.Mary.Value qualified as C
Expand Down Expand Up @@ -167,7 +167,7 @@ toDCert :: Network -> C.Coin -> C.Coin -> P.DCert -> Either ToCardanoError (C.DC
toDCert network poolDeposit minPoolCost = \case
P.DCertDelegRegKey (P.StakingHash stakingCredential) -> C.DCertDeleg . C.RegKey <$> toCredential stakingCredential
P.DCertDelegDeRegKey (P.StakingHash stakingCredential) -> C.DCertDeleg . C.DeRegKey <$> toCredential stakingCredential
P.DCertDelegDelegate (P.StakingHash stakingCredential) pubKeyHash -> C.DCertDeleg . C.Delegate <$> (C.Delegation <$> toCredential stakingCredential <*> toPubKeyHash pubKeyHash)
P.DCertDelegDelegate (P.StakingHash stakingCredential) pubKeyHash -> C.DCertDeleg . C.Delegate <$> (Delegation <$> toCredential stakingCredential <*> toPubKeyHash pubKeyHash)
P.DCertPoolRegister poolKeyHash poolVfr -> C.DCertPool . C.RegPool <$> toPoolParams poolKeyHash poolVfr
P.DCertPoolRetire pkh n -> C.DCertPool . (\key -> C.RetirePool key (C.EpochNo (fromIntegral n)) ) <$> toPubKeyHash pkh
P.DCertGenesis -> Left "DCertGenesis is not supported"
Expand Down