feat: massive overhaul and actually deterministic

unionlabs · Feb 9, 2024 · ec1bda2 · ec1bda2
1 parent 4cd12cf
commit ec1bda2
Show file tree

Hide file tree

Showing 10 changed files with 674 additions and 447 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,6 +28,7 @@ members = [
   "tools/parse-wasm-client-type",
   "zerg",
   "tools/cargo-workspace-dependencies",
+  "tools/keygen",
 ]
 
 resolver = "2"

diff --git a/dictionary.txt b/dictionary.txt
@@ -455,6 +455,7 @@ keccak
 keepertest
 keybase
 keyframes
+keygen
 keypair
 keypairs
 kwallet

diff --git a/flake.nix b/flake.nix
@@ -169,6 +169,7 @@
         ./cosmwasm/cosmwasm.nix
         ./evm/evm.nix
         ./tools/rust-proto.nix
+        ./tools/tools.nix
         ./tools/wasm-light-client.nix
         ./tools/generate-rust-sol-bindings/generate-rust-sol-bindings.nix
         ./tools/libwasmvm/libwasmvm.nix

diff --git a/networks/devnet.nix b/networks/devnet.nix
@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  perSystem = { devnetConfig, pkgs, lib, self', inputs', system, get-flake, mkCi, ... }:
+  perSystem = { devnetConfig, pkgs, lib, self', inputs', system, get-flake, mkCi, mkNodeId, dbg, ... }:
     let
       arion = inputs'.arion.packages.default;
 
@@ -10,10 +10,12 @@
             value = import ./services/uniond.nix {
               inherit pkgs;
               inherit id;
+              inherit mkNodeId dbg;
               uniond = self'.packages.uniond;
-              devnet-genesis = self'.packages.devnet-genesis;
-              devnet-validator-keys = self'.packages.devnet-validator-keys;
-              devnet-validator-node-ids = self'.packages.devnet-validator-node-ids;
+              devnet-genesis = self'.packages.devnet-union-genesis;
+              devnet-priv-validator-keys = self'.packages.devnet-union-priv-validator-keys;
+              devnet-validator-node-ids = self'.packages.devnet-union-validator-node-ids;
+              devnet-validator-node-keys = self'.packages.devnet-union-validator-node-keys;
             };
           })
           devnetConfig.validatorCount));
-Original file line number
+Diff line change
@@ Expand Up / @@ -455,6 +455,7 @@ keccak @@
     keepertest
     keybase
     keyframes
+    keygen
     keypair
     keypairs
     kwallet
@@ Expand Down @@