diff --git a/flake.lock b/flake.lock index 15cae16..3b82483 100644 --- a/flake.lock +++ b/flake.lock @@ -617,17 +617,17 @@ "cardano-configurations-8.1.1": { "flake": false, "locked": { - "lastModified": 1688088573, - "narHash": "sha256-NmuZhfS8Jgba3pl9j43D3mrsp6vArN84nmOt5H0BpIg=", + "lastModified": 1692193634, + "narHash": "sha256-cKw+iXKoMNrfN8M34/CtUelUZVLktVtzNzOYHI20dC0=", "owner": "input-output-hk", "repo": "cardano-configurations", - "rev": "cc75f41fcd854e2088d3792c46eb7033b445489b", + "rev": "9b69b59ef2fb2838855017f19af57b38c5d4abe4", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "cardano-configurations", - "rev": "cc75f41fcd854e2088d3792c46eb7033b445489b", + "rev": "9b69b59ef2fb2838855017f19af57b38c5d4abe4", "type": "github" } }, diff --git a/flake.nix b/flake.nix index ddcf5c4..aab361d 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ url = "github:intersectmbo/cardano-node?ref=8.1.1"; }; "cardano-configurations-8.1.1" = { - url = "github:input-output-hk/cardano-configurations/cc75f41fcd854e2088d3792c46eb7033b445489b"; + url = "github:input-output-hk/cardano-configurations/9b69b59ef2fb2838855017f19af57b38c5d4abe4"; flake = false; }; diff --git a/modules/node.nix b/modules/node.nix index ebd7d2d..11a7303 100644 --- a/modules/node.nix +++ b/modules/node.nix @@ -34,6 +34,7 @@ in { services.cardano-node = { enable = true; + package = lib.mkDefault pkgs.cardano-node; inherit (cfg) socketPath; nodeConfigFile = cfg.configPath; environment = config.cardano.network; diff --git a/packages/default.nix b/packages/default.nix index a7cc06a..aad3e6f 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -10,10 +10,11 @@ }; flake.overlays = { default = config.flake.overlays."cardano-node-8.7.3"; + "ctl-8" = config.flake.overlays."cardano-node-8.1.1"; "cardano-node-8.7.3" = final: _prev: # overlay for recent packages let - inherit ((config.perSystem final.system)) packages; + inherit (config.perSystem final.system) packages; in { cardano-cli = packages."cardano-cli-8.7.3"; cardano-node = packages."cardano-node-8.7.3"; @@ -21,16 +22,16 @@ ogmios = packages."ogmios-6.1.0"; kupo = packages."kupo-2.8.0"; }; - "ctl-8" = final: _prev: + "cardano-node-8.1.1" = final: _prev: # overlay for packages compatible with cardano-transaction-lib 8.0.0 let - inherit ((config.perSystem final.system)) packages; + inherit (config.perSystem final.system) packages; in { cardano-cli = packages."cardano-cli-8.1.1"; cardano-node = packages."cardano-node-8.1.1"; cardano-configurations = packages."cardano-configurations-8.1.1"; ogmios = packages."ogmios-6.0.3"; - kupo = packages."kupo-2.2.0"; + kupo = packages."kupo-2.6.1"; }; }; } diff --git a/tests/ctl-8.nix b/tests/ctl-8.nix new file mode 100644 index 0000000..e114490 --- /dev/null +++ b/tests/ctl-8.nix @@ -0,0 +1,34 @@ +{self, ...}: { + perSystem.vmTests.tests.ctl-8 = { + impure = true; + module = { + nodes .machine = {pkgs, ...}: { + # use packages compatible with cardano-transaction-lib 8.0.0 + nixpkgs.overlays = [self.overlays.ctl-8]; + + cardano = { + network = "preview"; + cli.enable = true; + node.enable = true; + ogmios.enable = true; + kupo.enable = true; + }; + + environment.systemPackages = with pkgs; [jq bc curl]; + }; + + testScript = {nodes, ...}: let + magic = toString nodes.machine.config.cardano.networkNumber; + in '' + machine.wait_for_unit("cardano-node") + machine.wait_for_unit("cardano-node-socket") + machine.wait_until_succeeds("""[[ $(echo "$(cardano-cli query tip --testnet-magic ${magic} | jq '.syncProgress' --raw-output) > 0.001" | bc) == "1" ]]""") + machine.wait_for_unit("ogmios") + machine.succeed("curl --silent --fail http://localhost:1337/health") + machine.wait_for_unit("kupo") + machine.succeed("curl --silent --fail http://localhost:1442/health") + machine.wait_until_succeeds("""[[ $(echo "$(curl --silent --fail http://localhost:1337/health | jq '.networkSynchronization' --raw-output) > 0.00001" | bc) == "1" ]]""") + ''; + }; + }; +} diff --git a/tests/default.nix b/tests/default.nix index 6161d79..061b353 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -6,5 +6,6 @@ ./kupo.nix ./http.nix ./db-sync.nix + ./ctl-8.nix ]; }