diff --git a/galoisd/go.mod b/galoisd/go.mod index c8585003e8..cb8a2a2a20 100644 --- 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 index bf03c9cd66..3f4a77ac35 100644 --- 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 index b25d04e587..3dc59fe713 100644 --- 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 index d6fe8d2e49..8ea345c371 100644 --- 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 index 1ec434136f..73a2b9d89d 100644 --- 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 index 5e0c51316e..d8dc66499a 100644 --- 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 index 195905647e..994122ecca 100644 --- 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 index 402055be4f..12b6ed00bd 100644 --- 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 @@ -34,9 +34,9 @@ func GenTxCmd(mbm module.BasicManager, txEncCfg client.TxEncodingConfig, genBalI fsCreateValidator, defaultsDesc := cli.CreateValidatorMsgFlagSet(ipDefault) cmd := &cobra.Command{ - Use: "gentx [key_name] [amount] [key_type]", + Use: "gentx [key_name] [amount]", Short: "Generate a genesis tx carrying a self delegation", - Args: cobra.ExactArgs(3), + Args: cobra.ExactArgs(2), Long: fmt.Sprintf(`Generate a genesis transaction that creates a validator with a self-delegation, that is signed by the key in the Keyring referenced by a given name. A node ID and consensus pubkey may optionally be provided. If they are omitted, they will be retrieved from the priv_validator.json @@ -65,7 +65,7 @@ $ %s gentx my-key-name 1000000stake secp256k1 --home=/path/to/home/dir --keyring config := serverCtx.Config config.SetRoot(clientCtx.HomeDir) - keyType := args[2] + keyType := "bn254" mnemonic := "" nodeID, valPubKey, err := genutil.InitializeNodeValidatorFilesFromMnemonicCustom(serverCtx.Config, mnemonic, keyType) if err != nil { 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 index df2a348fcd..91a5a6e50a 100644 --- 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 @@ -71,10 +71,10 @@ func displayInfo(info printInfo) error { // and the respective application. func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command { cmd := &cobra.Command{ - Use: "init [moniker] [key_type]", + Use: "init [moniker]", Short: "Initialize private validator, p2p, genesis, and application configuration files", Long: `Initialize validators's and node's configuration files.`, - Args: cobra.ExactArgs(2), + Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx := client.GetClientContextFromCmd(cmd) cdc := clientCtx.Codec @@ -114,7 +114,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command { initHeight = 1 } - keyType := args[1] + keyType := "bn254" nodeID, _, err := genutil.InitializeNodeValidatorFilesFromMnemonicCustom(config, mnemonic, keyType) if err != nil { 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 index 15161e965b..a6c8390958 100644 --- a/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/utils.go +++ b/uniond/vendor/github.com/cosmos/cosmos-sdk/x/genutil/utils.go @@ -8,6 +8,7 @@ import ( "time" cfg "github.com/cometbft/cometbft/config" + tmbn254 "github.com/cometbft/cometbft/crypto/bn254" tmed25519 "github.com/cometbft/cometbft/crypto/ed25519" "github.com/cometbft/cometbft/p2p" "github.com/cometbft/cometbft/privval" @@ -83,10 +84,16 @@ func InitializeNodeValidatorFilesFromMnemonicCustom(config *cfg.Config, mnemonic var filePV *privval.FilePV if len(mnemonic) == 0 { filePV = privval.LoadOrGenFilePVCustom(pvKeyFile, pvStateFile, keyType) - } else { + } else if keyType == "ed25519" { privKey := tmed25519.GenPrivKeyFromSecret([]byte(mnemonic)) filePV = privval.NewFilePV(privKey, pvKeyFile, pvStateFile) filePV.Save() + } else if keyType == "bn254" { + privKey := tmbn254.GenPrivKeyFromSeed([]byte(mnemonic)) + filePV = privval.NewFilePV(privKey, pvKeyFile, pvStateFile) + filePV.Save() + } else { + return "", nil, fmt.Errorf("keyType not supported: %s", keyType) } tmValPubKey, err := filePV.GetPubKey() diff --git a/uniond/vendor/modules.txt b/uniond/vendor/modules.txt index 336f9de2e1..13429eeb1e 100644 --- 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 index 2033e65729..613a775239 100644 --- 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), ],