test run gov vaults active collateral proposal

onomyprotocol · Sep 19, 2024 · cdc65c6 · cdc65c6
1 parent a9aec8c
commit cdc65c6
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 7 deletions.
diff --git a/app/ibc.go b/app/ibc.go
@@ -27,7 +27,7 @@ import (
 	ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper"
 	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	ibc "github.com/cosmos/ibc-go/v8/modules/core"
-	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint: staticcheck
+	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" // nolint: staticcheck
 	ibcconnectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
 	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
@@ -38,6 +38,8 @@ import (
 	// this line is used by starport scaffolding # ibc/app/import
 	oraclemodule "github.com/onomyprotocol/reserve/x/oracle/module"
 	oraclemoduletypes "github.com/onomyprotocol/reserve/x/oracle/types"
+	vaults "github.com/onomyprotocol/reserve/x/vaults/module"
+	vaultstypes "github.com/onomyprotocol/reserve/x/vaults/types"
 )
 
 // registerIBCModules register IBC keepers and non dependency inject modules.
@@ -93,7 +95,8 @@ func (app *App) registerIBCModules() error {
 	// by granting the governance module the right to execute the message.
 	// See: https://docs.cosmos.network/main/modules/gov#proposal-messages
 	govRouter := govv1beta1.NewRouter()
-	govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler)
+	govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler).
+		AddRoute(vaultstypes.RouterKey, vaults.NewVaultsProposalHandler(&app.VaultsKeeper))
 
 	app.IBCFeeKeeper = ibcfeekeeper.NewKeeper(
 		app.appCodec, app.GetKey(ibcfeetypes.StoreKey),

diff --git a/script/mnemonic/mnemonic1 b/script/mnemonic/mnemonic1
@@ -0,0 +1 @@
+ozone unfold device pave lemon potato omit insect column wise cover hint narrow large provide kidney episode clay notable milk mention dizzy muffin crazy
diff --git a/script/mnemonic/mnemonic2 b/script/mnemonic/mnemonic2
@@ -0,0 +1 @@
+soap step crash ceiling path virtual this armor accident pond share track spice woman vault discover share holiday inquiry oak shine scrub bulb arrive
diff --git a/script/mnemonic/mnemonic3 b/script/mnemonic/mnemonic3
@@ -0,0 +1 @@
+travel jelly basic visa apart kidney piano lumber elevator fat unknown guard matter used high drastic umbrella humble crush stock banner enlist mule unique
diff --git a/script/vaults-gov-test.sh b/script/vaults-gov-test.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+set -xeu
+
+# always returns true so set -e doesn't exit if it is not running.
+killall reserved || true
+rm -rf $HOME/.reserved/
+
+mkdir $HOME/.reserved
+mkdir $HOME/.reserved/validator1
+mkdir $HOME/.reserved/validator2
+mkdir $HOME/.reserved/validator3
+
+# init all three validators
+reserved init --chain-id=testing-1 validator1 --home=$HOME/.reserved/validator1
+reserved init --chain-id=testing-1 validator2 --home=$HOME/.reserved/validator2
+reserved init --chain-id=testing-1 validator3 --home=$HOME/.reserved/validator3
+
+# create keys for all three validators
+echo $(cat ./script/mnemonic/mnemonic1)| reserved keys add validator1 --recover --keyring-backend=test --home=$HOME/.reserved/validator1
+echo $(cat ./script/mnemonic/mnemonic2)| reserved keys add validator2 --recover --keyring-backend=test --home=$HOME/.reserved/validator2
+echo $(cat ./script/mnemonic/mnemonic3)| reserved keys add validator3 --recover --keyring-backend=test --home=$HOME/.reserved/validator3
+
+# create validator node with tokens to transfer to the three other nodes
+reserved genesis add-genesis-account $(reserved keys show validator1 -a --keyring-backend=test --home=$HOME/.reserved/validator1) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator1 
+reserved genesis add-genesis-account $(reserved keys show validator2 -a --keyring-backend=test --home=$HOME/.reserved/validator2) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator1 
+reserved genesis add-genesis-account $(reserved keys show validator3 -a --keyring-backend=test --home=$HOME/.reserved/validator3) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator1 
+reserved genesis add-genesis-account $(reserved keys show validator1 -a --keyring-backend=test --home=$HOME/.reserved/validator1) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator2 
+reserved genesis add-genesis-account $(reserved keys show validator2 -a --keyring-backend=test --home=$HOME/.reserved/validator2) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator2 
+reserved genesis add-genesis-account $(reserved keys show validator3 -a --keyring-backend=test --home=$HOME/.reserved/validator3) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator2 
+reserved genesis add-genesis-account $(reserved keys show validator1 -a --keyring-backend=test --home=$HOME/.reserved/validator1) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator3 
+reserved genesis add-genesis-account $(reserved keys show validator2 -a --keyring-backend=test --home=$HOME/.reserved/validator2) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator3 
+reserved genesis add-genesis-account $(reserved keys show validator3 -a --keyring-backend=test --home=$HOME/.reserved/validator3) 10000000000000000000000000000000stake,10000000000000000000000000000000usdt --home=$HOME/.reserved/validator3 
+reserved genesis gentx validator1 1000000000000000000000stake --keyring-backend=test --home=$HOME/.reserved/validator1 --chain-id=testing-1
+reserved genesis gentx validator2 1000000000000000000000stake --keyring-backend=test --home=$HOME/.reserved/validator2 --chain-id=testing-1
+reserved genesis gentx validator3 1000000000000000000000stake --keyring-backend=test --home=$HOME/.reserved/validator3 --chain-id=testing-1
+
+# cp validator2/config/gentx/*.json $HOME/.reserved/validator1/config/gentx/
+# cp validator3/config/gentx/*.json $HOME/.reserved/validator1/config/gentx/
+reserved genesis collect-gentxs --home=$HOME/.reserved/validator1 
+
+# change app.toml values
+VALIDATOR1_APP_TOML=$HOME/.reserved/validator1/config/app.toml
+VALIDATOR2_APP_TOML=$HOME/.reserved/validator2/config/app.toml
+VALIDATOR3_APP_TOML=$HOME/.reserved/validator3/config/app.toml
+
+# validator1
+sed -i -E 's|0.0.0.0:9090|0.0.0.0:9050|g' $VALIDATOR1_APP_TOML
+sed -i -E 's|127.0.0.1:9090|127.0.0.1:9050|g' $VALIDATOR1_APP_TOML
+sed -i -E 's|minimum-gas-prices = ""|minimum-gas-prices = "0.0001stake"|g' $VALIDATOR1_APP_TOML
+
+# validator2
+sed -i -E 's|tcp://0.0.0.0:1317|tcp://0.0.0.0:1316|g' $VALIDATOR2_APP_TOML
+sed -i -E 's|0.0.0.0:9090|0.0.0.0:9088|g' $VALIDATOR2_APP_TOML
+sed -i -E 's|0.0.0.0:9091|0.0.0.0:9089|g' $VALIDATOR2_APP_TOML
+sed -i -E 's|minimum-gas-prices = ""|minimum-gas-prices = "0.0001stake"|g' $VALIDATOR2_APP_TOML
+
+# validator3
+sed -i -E 's|tcp://0.0.0.0:1317|tcp://0.0.0.0:1315|g' $VALIDATOR3_APP_TOML
+sed -i -E 's|0.0.0.0:9090|0.0.0.0:9086|g' $VALIDATOR3_APP_TOML
+sed -i -E 's|0.0.0.0:9091|0.0.0.0:9087|g' $VALIDATOR3_APP_TOML
+sed -i -E 's|minimum-gas-prices = ""|minimum-gas-prices = "0.0001stake"|g' $VALIDATOR3_APP_TOML
+
+# change config.toml values
+VALIDATOR1_CONFIG=$HOME/.reserved/validator1/config/config.toml
+VALIDATOR2_CONFIG=$HOME/.reserved/validator2/config/config.toml
+VALIDATOR3_CONFIG=$HOME/.reserved/validator3/config/config.toml
+
+
+# validator1
+sed -i -E 's|allow_duplicate_ip = false|allow_duplicate_ip = true|g' $VALIDATOR1_CONFIG
+sed -i -E 's|prometheus = false|prometheus = true|g' $VALIDATOR1_CONFIG
+
+
+# validator2
+sed -i -E 's|tcp://127.0.0.1:26658|tcp://127.0.0.1:26655|g' $VALIDATOR2_CONFIG
+sed -i -E 's|tcp://127.0.0.1:26657|tcp://127.0.0.1:26654|g' $VALIDATOR2_CONFIG
+sed -i -E 's|tcp://0.0.0.0:26656|tcp://0.0.0.0:26653|g' $VALIDATOR2_CONFIG
+sed -i -E 's|allow_duplicate_ip = false|allow_duplicate_ip = true|g' $VALIDATOR2_CONFIG
+sed -i -E 's|prometheus = false|prometheus = true|g' $VALIDATOR2_CONFIG
+sed -i -E 's|prometheus_listen_addr = ":26660"|prometheus_listen_addr = ":26630"|g' $VALIDATOR2_CONFIG
+
+# validator3
+sed -i -E 's|tcp://127.0.0.1:26658|tcp://127.0.0.1:26652|g' $VALIDATOR3_CONFIG
+sed -i -E 's|tcp://127.0.0.1:26657|tcp://127.0.0.1:26651|g' $VALIDATOR3_CONFIG
+sed -i -E 's|tcp://0.0.0.0:26656|tcp://0.0.0.0:26650|g' $VALIDATOR3_CONFIG
+sed -i -E 's|allow_duplicate_ip = false|allow_duplicate_ip = true|g' $VALIDATOR3_CONFIG
+sed -i -E 's|prometheus = false|prometheus = true|g' $VALIDATOR3_CONFIG
+sed -i -E 's|prometheus_listen_addr = ":26660"|prometheus_listen_addr = ":26620"|g' $VALIDATOR3_CONFIG
+
+# copy, update validator1 genesis file to validator2-3
+update_test_genesis () {
+    cat $HOME/.reserved/validator1/config/genesis.json | jq "$1" > tmp.json && mv tmp.json $HOME/.reserved/validator1/config/genesis.json
+}
+
+update_test_genesis '.app_state["gov"]["params"]["voting_period"] = "15s"'
+update_test_genesis '.app_state["gov"]["params"]["expedited_voting_period"] = "10s"'
+
+cp $HOME/.reserved/validator1/config/genesis.json $HOME/.reserved/validator2/config/genesis.json
+cp $HOME/.reserved/validator1/config/genesis.json $HOME/.reserved/validator3/config/genesis.json
+
+# copy tendermint node id of validator1 to persistent peers of validator2-3
+node1=$(reserved tendermint show-node-id --home=$HOME/.reserved/validator1)
+node2=$(reserved tendermint show-node-id --home=$HOME/.reserved/validator2)
+node3=$(reserved tendermint show-node-id --home=$HOME/.reserved/validator3)
+sed -i -E "s|persistent_peers = \"\"|persistent_peers = \"$node1@localhost:26656,$node2@localhost:26656,$node3@localhost:26656\"|g" $HOME/.reserved/validator1/config/config.toml
+sed -i -E "s|persistent_peers = \"\"|persistent_peers = \"$node1@localhost:26656,$node2@localhost:26656,$node3@localhost:26656\"|g" $HOME/.reserved/validator2/config/config.toml
+sed -i -E "s|persistent_peers = \"\"|persistent_peers = \"$node1@localhost:26656,$node2@localhost:26656,$node3@localhost:26656\"|g" $HOME/.reserved/validator3/config/config.toml
+
+
+# # start all three validators
+screen -S onomy1 -t onomy1 -d -m reserved start --home=$HOME/.reserved/validator1
+screen -S onomy2 -t onomy2 -d -m reserved start --home=$HOME/.reserved/validator2
+screen -S onomy3 -t onomy3 -d -m reserved start --home=$HOME/.reserved/validator3
+
+# submit proposal add usdt
+sleep 7
+reserved q gov proposals
+reserved tx gov submit-legacy-proposal active-collateral "title" "description" "atom" "10" "0.1" "10000" 10000000000000000000stake --keyring-backend=test  --home=$HOME/.reserved/validator1 --from validator1 -y --chain-id testing-1 --fees 20stake
+
+# vote
+sleep 7
+reserved tx gov vote 1 yes  --from validator1 --keyring-backend test --home ~/.reserved/validator1 --chain-id testing-1 -y --fees 20stake
+reserved tx gov vote 1 yes  --from validator2 --keyring-backend test --home ~/.reserved/validator2 --chain-id testing-1 -y --fees 20stake
+reserved tx gov vote 1 yes  --from validator3 --keyring-backend test --home ~/.reserved/validator3 --chain-id testing-1 -y --fees 20stake
+
+# wait voting_perio=15s
+sleep 15
+echo "========sleep=========="
+reserved q gov proposals
diff --git a/x/vaults/client/cli/tx.go b/x/vaults/client/cli/tx.go
@@ -17,8 +17,8 @@ import (
 
 func NewCmdSubmitActiveCollateralProposal() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "active-collateral [title] [description] [denom] [min-collateral-ratio] [liquidation-ratio] [max-debt] [proposer] [deposit]",
-		Args:  cobra.ExactArgs(8),
+		Use:   "active-collateral [title] [description] [denom] [min-collateral-ratio] [liquidation-ratio] [max-debt] [deposit]",
+		Args:  cobra.ExactArgs(7),
 		Short: "Active collateral proposal",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
@@ -39,18 +39,17 @@ func NewCmdSubmitActiveCollateralProposal() *cobra.Command {
 			if !ok {
 				return fmt.Errorf("value %s cannot constructs Int from string", args[5])
 			}
-			from := sdk.MustAccAddressFromBech32(args[6])
 
 			content := types.NewActiveCollateralProposal(
 				args[0], args[1], args[2], minCollateralRatio, liquidationRatio, maxDebt,
 			)
 
-			deposit, err := sdk.ParseCoinsNormalized(args[7])
+			deposit, err := sdk.ParseCoinsNormalized(args[6])
 			if err != nil {
 				return err
 			}
 
-			msg, err := govtypes.NewMsgSubmitProposal(&content, deposit, from)
+			msg, err := govtypes.NewMsgSubmitProposal(&content, deposit, clientCtx.GetFromAddress())
 			if err != nil {
 				return err
 			}

diff --git a/x/vaults/types/codec.go b/x/vaults/types/codec.go
@@ -4,6 +4,7 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	// this line is used by starport scaffolding # 1
 )
 
@@ -19,5 +20,11 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		&MsgMint{},
 		&MsgRepay{},
 	)
+
+	registry.RegisterImplementations(
+		(*govtypes.Content)(nil),
+		&ActiveCollateralProposal{},
+	)
+
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ozone unfold device pave lemon potato omit insect column wise cover hint narrow large provide kidney episode clay notable milk mention dizzy muffin crazy
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		soap step crash ceiling path virtual this armor accident pond share track spice woman vault discover share holiday inquiry oak shine scrub bulb arrive
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		travel jelly basic visa apart kidney piano lumber elevator fat unknown guard matter used high drastic umbrella humble crush stock banner enlist mule unique