feat: remove keytype from init and gentx (#1294)

unionlabs · Feb 7, 2024 · 1f26b8c · 1f26b8c
2 parents 5ddef39 + f0b4ee5
commit 1f26b8c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 22 deletions.
diff --git a/galoisd/go.mod b/galoisd/go.mod
@@ -118,6 +118,6 @@ replace (
 	github.com/consensys/gnark => github.com/consensys/gnark v0.9.2-0.20240115131420-34fdb0391653
 	// Fork of gnark crypto until https://github.com/ConsenSys/gnark-crypto/pull/314 is merged
 	github.com/consensys/gnark-crypto => github.com/unionlabs/gnark-crypto v0.0.0-20240112093739-635c1b6963c6
-	github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b
+	github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832
 	github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.11
 )
diff --git a/galoisd/go.sum b/galoisd/go.sum
@@ -432,8 +432,8 @@ github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqri
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/unionlabs/cometbls v0.0.0-20240125180347-5b33e3460932 h1:ecEdIXw7w3I4JEpNoNMwpHu4Iy6PRgGl++uWQIcPYBw=
 github.com/unionlabs/cometbls v0.0.0-20240125180347-5b33e3460932/go.mod h1:ZN5TH4WzX9x+hgcipytd0WghjGcCBy6M8YVgnHOCd/0=
-github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b h1:eUv6PZDYQaO4vFVGYXlufFjiDq8UnZtmoVyBen+uzyo=
-github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b/go.mod h1:iEaeKpRLz88bVPyU7Zk0WODyY05qHmR33vNsFaJ4lP8=
+github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832 h1:Yzf3nF11ClR8geNwP+oe+ZJG489q4dYgQJlBL42ANiA=
+github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832/go.mod h1:iEaeKpRLz88bVPyU7Zk0WODyY05qHmR33vNsFaJ4lP8=
 github.com/unionlabs/gnark-crypto v0.0.0-20240112093739-635c1b6963c6 h1:wRt6Yt29bWvwCSeRmRJ/Wm1sRev1GjJGXn4MzSrMbv4=
 github.com/unionlabs/gnark-crypto v0.0.0-20240112093739-635c1b6963c6/go.mod h1:wKqwsieaKPThcFkHe0d0zMsbHEUWFmZcG7KBCse210o=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

diff --git a/galoisd/vendor/modules.txt b/galoisd/vendor/modules.txt
@@ -418,7 +418,7 @@ github.com/cosmos/cosmos-db
 github.com/cosmos/cosmos-proto
 github.com/cosmos/cosmos-proto/anyutil
 github.com/cosmos/cosmos-proto/runtime
-# github.com/cosmos/cosmos-sdk v0.50.2 => github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b
+# github.com/cosmos/cosmos-sdk v0.50.2 => github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832
 ## explicit; go 1.21
 github.com/cosmos/cosmos-sdk/codec
 github.com/cosmos/cosmos-sdk/codec/types
@@ -873,5 +873,5 @@ sigs.k8s.io/yaml
 # github.com/cometbft/cometbft => github.com/unionlabs/cometbls v0.0.0-20240125180347-5b33e3460932
 # github.com/consensys/gnark => github.com/consensys/gnark v0.9.2-0.20240115131420-34fdb0391653
 # github.com/consensys/gnark-crypto => github.com/unionlabs/gnark-crypto v0.0.0-20240112093739-635c1b6963c6
-# github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b
+# github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832
 # github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.11
diff --git a/networks/genesis/devnet.nix b/networks/genesis/devnet.nix
@@ -21,7 +21,7 @@
         pkgs.runCommand "node-id" { } ''
           export HOME=$(pwd)
 
-          ${uniond} init testnet bn254 --chain-id ${chainId} --home .
+          ${uniond} init testnet --chain-id ${chainId} --home .
           mkdir -p $out
           mv ./config/node_key.json $out/${name}
         '';
@@ -34,7 +34,7 @@
           export HOME=$(pwd)
           mkdir -p $out
 
-          ${uniond} init testnet bn254 --chain-id ${chainId} --home $out
+          ${uniond} init testnet --chain-id ${chainId} --home $out
 
           echo ${alice} | ${uniond} keys add \
             --recover ${genesisAccountName} \
@@ -483,7 +483,7 @@
                 }.json | jq ."pub_key"."value"`
                 PUBKEY="{\"@type\":\"/cosmos.crypto.bn254.PubKey\",\"key\":$PUBKEY}"
                 mkdir -p $out
-                ${uniond} genesis gentx val-${toString i} 1000000000000000000000stake "bn254" --keyring-backend test --chain-id ${chainId} --home ${home} --ip "0.0.0.0" --pubkey $PUBKEY --moniker validator-${toString i} --output-document $out/valgentx-${
+                ${uniond} genesis gentx val-${toString i} 1000000000000000000000stake --keyring-backend test --chain-id ${chainId} --home ${home} --ip "0.0.0.0" --pubkey $PUBKEY --moniker validator-${toString i} --output-document $out/valgentx-${
                   toString i
                 }.json
               '')

diff --git a/networks/services/uniond.nix b/networks/services/uniond.nix
@@ -3,7 +3,7 @@ let
   getNodeID = nodeFile:
     pkgs.runCommand "get-node-id" { } ''
       export HOME=$(pwd)
-      ${uniond}/bin/uniond init testnet bn254 --home .
+      ${uniond}/bin/uniond init testnet --home .
       cp ${devnet-validator-node-ids}/${nodeFile} ./config/node_key.json
       NODE_ID=$(${uniond}/bin/uniond tendermint show-node-id --home .)
       echo -n $NODE_ID > $out

diff --git a/uniond/go.mod b/uniond/go.mod
@@ -225,7 +225,7 @@ replace (
 	github.com/consensys/gnark => github.com/consensys/gnark v0.9.1-0.20231013131835-4ebcccd9c0a8
 	// Fork of gnark crypto until https://github.com/ConsenSys/gnark-crypto/pull/314 is merged
 	github.com/consensys/gnark-crypto => github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578
-	github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b
+	github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832
 	github.com/cosmos/ibc-go/modules/light-clients/08-wasm => github.com/unionlabs/ibc-go/modules/light-clients/08-wasm v0.0.0-20231219091832-0947f2e3d1aa
 
 	github.com/cosmos/ibc-go/v8 => github.com/unionlabs/ibc-go/v8 v8.0.0-20231219091832-0947f2e3d1aa

diff --git a/uniond/go.sum b/uniond/go.sum
@@ -1084,8 +1084,8 @@ github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/unionlabs/cometbls v0.0.0-20240125180347-5b33e3460932 h1:ecEdIXw7w3I4JEpNoNMwpHu4Iy6PRgGl++uWQIcPYBw=
 github.com/unionlabs/cometbls v0.0.0-20240125180347-5b33e3460932/go.mod h1:ZN5TH4WzX9x+hgcipytd0WghjGcCBy6M8YVgnHOCd/0=
-github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b h1:eUv6PZDYQaO4vFVGYXlufFjiDq8UnZtmoVyBen+uzyo=
-github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b/go.mod h1:iEaeKpRLz88bVPyU7Zk0WODyY05qHmR33vNsFaJ4lP8=
+github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832 h1:Yzf3nF11ClR8geNwP+oe+ZJG489q4dYgQJlBL42ANiA=
+github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832/go.mod h1:iEaeKpRLz88bVPyU7Zk0WODyY05qHmR33vNsFaJ4lP8=
 github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578 h1:Owzup0XvshGNHgS1s0xUI/mZM+fPvTT7dLg7P0cT2vQ=
 github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
 github.com/unionlabs/ibc-go/modules/light-clients/08-wasm v0.0.0-20231219091832-0947f2e3d1aa h1:pzXp42whoLAzvNkdJHPnWPzWAN2iDtqAFoN/BksxmAE=

diff --git a/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/client/cli/gentx.go b/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/client/cli/gentx.go
diff --git a/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/client/cli/init.go b/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/client/cli/init.go
diff --git a/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/utils.go b/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/utils.go
diff --git a/uniond/vendor/modules.txt b/uniond/vendor/modules.txt
@@ -519,7 +519,7 @@ github.com/cosmos/cosmos-db
 github.com/cosmos/cosmos-proto
 github.com/cosmos/cosmos-proto/anyutil
 github.com/cosmos/cosmos-proto/runtime
-# github.com/cosmos/cosmos-sdk v0.50.2 => github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b
+# github.com/cosmos/cosmos-sdk v0.50.2 => github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832
 ## explicit; go 1.21
 github.com/cosmos/cosmos-sdk/baseapp
 github.com/cosmos/cosmos-sdk/baseapp/internal/protocompat
@@ -1758,7 +1758,7 @@ sigs.k8s.io/yaml/goyaml.v2
 # github.com/cometbft/cometbft => github.com/unionlabs/cometbls v0.0.0-20240125180347-5b33e3460932
 # github.com/consensys/gnark => github.com/consensys/gnark v0.9.1-0.20231013131835-4ebcccd9c0a8
 # github.com/consensys/gnark-crypto => github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578
-# github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240125200611-e1b8b82c712b
+# github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20240206230727-9973b232e832
 # github.com/cosmos/ibc-go/modules/light-clients/08-wasm => github.com/unionlabs/ibc-go/modules/light-clients/08-wasm v0.0.0-20231219091832-0947f2e3d1aa
 # github.com/cosmos/ibc-go/v8 => github.com/unionlabs/ibc-go/v8 v8.0.0-20231219091832-0947f2e3d1aa
 # github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
diff --git a/unionvisor/src/cli.rs b/unionvisor/src/cli.rs
@@ -174,7 +174,6 @@ impl InitCmd {
             args: vec![
                 OsString::from("init"),
                 OsString::from(self.moniker.clone()),
-                OsString::from("bn254"),
                 OsString::from("--chain-id"),
                 OsString::from(&self.network),
             ],