diff --git a/templates/ctl-scaffold/flake.lock b/templates/ctl-scaffold/flake.lock index f0d3d4504..600f05c0b 100644 --- a/templates/ctl-scaffold/flake.lock +++ b/templates/ctl-scaffold/flake.lock @@ -2781,17 +2781,17 @@ "ogmios": "ogmios_2" }, "locked": { - "lastModified": 1722512833, - "narHash": "sha256-1r2/punsH/iVCk3iHO4pexUA1bQ49Fbh8+r5FzII9eY=", + "lastModified": 1722613689, + "narHash": "sha256-CACNiPCxPpKNUZpW9Mq7IDa3YwMUqymFIr2bzMWc5bA=", "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "127cc209a5d2c15cf77bc2edffc108baff9bc8a3", + "rev": "01708d64e858a2ed3cbbc7a9a235d3acf79a7b91", "type": "github" }, "original": { "owner": "Plutonomicon", "repo": "cardano-transaction-lib", - "rev": "127cc209a5d2c15cf77bc2edffc108baff9bc8a3", + "rev": "01708d64e858a2ed3cbbc7a9a235d3acf79a7b91", "type": "github" } }, diff --git a/templates/ctl-scaffold/flake.nix b/templates/ctl-scaffold/flake.nix index 967e354e1..1a2ea7735 100644 --- a/templates/ctl-scaffold/flake.nix +++ b/templates/ctl-scaffold/flake.nix @@ -16,7 +16,7 @@ type = "github"; owner = "Plutonomicon"; repo = "cardano-transaction-lib"; - rev = "127cc209a5d2c15cf77bc2edffc108baff9bc8a3"; + rev = "01708d64e858a2ed3cbbc7a9a235d3acf79a7b91"; }; # To use the same version of `nixpkgs` as we do nixpkgs.follows = "ctl/nixpkgs"; diff --git a/templates/ctl-scaffold/packages.dhall b/templates/ctl-scaffold/packages.dhall index 54a8e7472..3a03a3683 100644 --- a/templates/ctl-scaffold/packages.dhall +++ b/templates/ctl-scaffold/packages.dhall @@ -476,7 +476,7 @@ let additions = ] , repo = "https://github.com/mlabs-haskell/purescript-cardano-transaction-builder" - , version = "40628bbb1049f3eb5364d304f949135e2ee2a2fb" + , version = "36343059b67ffe15e74803078299a486959a5aa3" } , cardano-transaction-lib = { dependencies = @@ -588,7 +588,7 @@ let additions = , "web-storage" ] , repo = "https://github.com/Plutonomicon/cardano-transaction-lib.git" - , version = "127cc209a5d2c15cf77bc2edffc108baff9bc8a3" + , version = "01708d64e858a2ed3cbbc7a9a235d3acf79a7b91" } } diff --git a/templates/ctl-scaffold/spago-packages.nix b/templates/ctl-scaffold/spago-packages.nix index 6fc139c9b..e205ea4d6 100644 --- a/templates/ctl-scaffold/spago-packages.nix +++ b/templates/ctl-scaffold/spago-packages.nix @@ -283,11 +283,11 @@ let "cardano-transaction-builder" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-builder"; - version = "40628bbb1049f3eb5364d304f949135e2ee2a2fb"; + version = "36343059b67ffe15e74803078299a486959a5aa3"; src = pkgs.fetchgit { url = "https://github.com/mlabs-haskell/purescript-cardano-transaction-builder"; - rev = "40628bbb1049f3eb5364d304f949135e2ee2a2fb"; - sha256 = "0i7m20gs2aax47n69i7f8kphnkl5hj6xillhsvgvjbm3hn3lm838"; + rev = "36343059b67ffe15e74803078299a486959a5aa3"; + sha256 = "19fg613ch96vw7ypknjf2k5p66lighvrfvdx04wp3l0gk06da9wc"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; @@ -295,11 +295,11 @@ let "cardano-transaction-lib" = pkgs.stdenv.mkDerivation { name = "cardano-transaction-lib"; - version = "127cc209a5d2c15cf77bc2edffc108baff9bc8a3"; + version = "01708d64e858a2ed3cbbc7a9a235d3acf79a7b91"; src = pkgs.fetchgit { url = "https://github.com/Plutonomicon/cardano-transaction-lib.git"; - rev = "127cc209a5d2c15cf77bc2edffc108baff9bc8a3"; - sha256 = "1rpm10r1gygayghmdx1qnkah05bv57p1rqjd1aazh7zcx6kbzgfn"; + rev = "01708d64e858a2ed3cbbc7a9a235d3acf79a7b91"; + sha256 = "1c75kk2wr6xx4a2jkaql0divfdi0pg5g8mlsa66r4gmiy248s008"; }; phases = "installPhase"; installPhase = "ln -s $src $out"; diff --git a/templates/ctl-scaffold/test/E2E.purs b/templates/ctl-scaffold/test/E2E.purs index 6317fd345..acf0922dc 100644 --- a/templates/ctl-scaffold/test/E2E.purs +++ b/templates/ctl-scaffold/test/E2E.purs @@ -5,9 +5,10 @@ import Contract.Prelude import Contract.Config ( ContractParams + , KnownWallet(Nami, Gero, Flint, Eternl, Lode) , WalletSpec(ConnectToGenericCip30) - , mainnetConfig , testnetConfig + , walletName ) import Contract.Monad (Contract) import Contract.Test.E2E (E2EConfigName, E2ETestName, addLinks, route) @@ -21,35 +22,27 @@ main = do route configs tests configs :: Map E2EConfigName (ContractParams /\ Maybe String) -configs = Map.fromFoldable - [ "nami" /\ testnetConfig' "nami" /\ Nothing - , "gero" /\ testnetConfig' "gerowallet" /\ Nothing - , "flint" /\ testnetConfig' "flint" /\ Nothing - , "eternl" /\ testnetConfig' "eternl" /\ Nothing - , "lode" /\ testnetConfig' "LodeWallet" /\ Nothing - , "nami-mock" /\ testnetConfig' "nami" /\ Just "nami" - , "gero-mock" /\ testnetConfig' "gerowallet" /\ Just "gerowallet" - , "flint-mock" /\ testnetConfig' "flint" /\ Just "flint" - , "lode-mock" /\ testnetConfig' "LodeWallet" /\ Just "LodeWallet" - -- Plutip cluster's network ID is set to mainnet: - , "plutip-nami-mock" /\ mainnetConfig' "nami" /\ Just "nami" - , "plutip-gero-mock" /\ mainnetConfig' "gerowallet" /\ Just "gerowallet" - , "plutip-flint-mock" /\ mainnetConfig' "flint" /\ Just "flint" - , "plutip-lode-mock" /\ mainnetConfig' "LodeWallet" /\ Just "LodeWallet" +configs = map (map walletName) <$> Map.fromFoldable + [ "nami" /\ testnetConfig' Nami /\ Nothing + , "gero" /\ testnetConfig' Gero /\ Nothing + , "flint" /\ testnetConfig' Flint /\ Nothing + , "eternl" /\ testnetConfig' Eternl /\ Nothing + , "lode" /\ testnetConfig' Lode /\ Nothing + , "nami-mock" /\ testnetConfig' Nami /\ Just Nami + , "gero-mock" /\ testnetConfig' Gero /\ Just Gero + , "flint-mock" /\ testnetConfig' Flint /\ Just Flint + , "lode-mock" /\ testnetConfig' Lode /\ Just Lode + , "plutip-nami-mock" /\ testnetConfig' Nami /\ Just Nami + , "plutip-gero-mock" /\ testnetConfig' Gero /\ Just Gero + , "plutip-flint-mock" /\ testnetConfig' Flint /\ Just Flint + , "plutip-lode-mock" /\ testnetConfig' Lode /\ Just Lode ] where - testnetConfig' :: String -> ContractParams + testnetConfig' :: KnownWallet -> ContractParams testnetConfig' wallet = testnetConfig { walletSpec = - Just $ ConnectToGenericCip30 wallet { cip95: false } - } - - mainnetConfig' :: String -> ContractParams - mainnetConfig' wallet = - mainnetConfig - { walletSpec = - Just $ ConnectToGenericCip30 wallet { cip95: false } + Just $ ConnectToGenericCip30 (walletName wallet) { cip95: false } } tests :: Map E2ETestName (Contract Unit)