diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6388daf09..a07037b5d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: go.sum - name: start localnet run: | - TESTNET_NVAL=6 make clean localnet-start + make clean localnet-start if: env.GIT_DIFF - name: test liveness run: | diff --git a/Dockerfile b/Dockerfile index ac8ca8c4b..1409ab55e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ WORKDIR /code COPY ${source} /code/ # Install mimalloc -RUN git clone --depth 1 https://github.com/microsoft/mimalloc; cd mimalloc; mkdir build; cd build; cmake ..; make -j$(nproc); make install +RUN git clone -b v2.0.0 --depth 1 https://github.com/microsoft/mimalloc; cd mimalloc; mkdir build; cd build; cmake ..; make -j$(nproc); make install ENV MIMALLOC_RESERVE_HUGE_OS_PAGES=4 # Cosmwasm - download correct libwasmvm version and verify checksum diff --git a/Makefile b/Makefile index de4de2030..32093b405 100755 --- a/Makefile +++ b/Makefile @@ -12,9 +12,11 @@ DOCKER := $(shell which docker) DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf #TESTNET PARAMETERS -TESTNET_NVAL := $(if $(TESTNET_NVAL),$(TESTNET_NVAL),4) -TESTNET_CHAINID := $(if $(TESTNET_CHAINID),$(TESTNET_CHAINID),localnet-1) -TESTNET_VOTING_PERIOD := $(if $(TESTNET_VOTING_PERIOD),$(TESTNET_VOTING_PERIOD),86400s) +TESTNET_NVAL := $(if $(TESTNET_NVAL),$(TESTNET_NVAL),7) +TESTNET_CHAINID := $(if $(TESTNET_CHAINID),$(TESTNET_CHAINID),localterra) + +#OPERATOR ARGS +NODE_VERSION := $(if $(NODE_VERSION),$(NODE_VERSION),alpine3.17) ifneq ($(OS),Windows_NT) UNAME_S = $(shell uname -s) @@ -251,7 +253,7 @@ proto-check-breaking: ### Localnet ### ############################################################################### -# Run a 4-node testnet locally +# Run a 7-node testnet locally by default localnet-start: localnet-stop build-linux $(if $(shell $(DOCKER) inspect -f '{{ .Id }}' classic-terra/terrad-env 2>/dev/null),$(info found image classic-terra/terrad-env),$(MAKE) -C contrib/localnet terrad-env) if ! [ -f build/node0/terrad/config/genesis.json ]; then $(DOCKER) run --platform linux/amd64 --rm \ @@ -262,24 +264,23 @@ localnet-start: localnet-stop build-linux -v /etc/shadow:/etc/shadow:ro \ classic-terra/terrad-env testnet --chain-id ${TESTNET_CHAINID} --v ${TESTNET_NVAL} -o . --starting-ip-address 192.168.10.2 --keyring-backend=test; \ fi - for i in $$(seq 0 5); do \ - echo $$i; \ - jq '.app_state.gov.voting_params.voting_period = "${TESTNET_VOTING_PERIOD}"' build/node$$i/terrad/config/genesis.json > build/node$$i/terrad/config/genesis.json.tmp; \ - mv build/node$$i/terrad/config/genesis.json.tmp build/node$$i/terrad/config/genesis.json; \ - done docker-compose up -d localnet-start-upgrade: localnet-upgrade-stop build-linux $(MAKE) -C contrib/updates build-cosmovisor-linux BUILDDIR=$(BUILDDIR) $(if $(shell $(DOCKER) inspect -f '{{ .Id }}' classic-terra/terrad-upgrade-env 2>/dev/null),$(info found image classic-terra/terrad-upgrade-env),$(MAKE) -C contrib/localnet terrad-upgrade-env) - bash contrib/updates/prepare_cosmovisor.sh $(BUILDDIR) + bash contrib/updates/prepare_cosmovisor.sh $(BUILDDIR) ${TESTNET_NVAL} ${TESTNET_CHAINID} docker-compose -f ./contrib/updates/docker-compose.yml up -d localnet-upgrade-stop: docker-compose -f ./contrib/updates/docker-compose.yml down + rm -rf build/node* + rm -rf build/gentxs localnet-stop: docker-compose down + rm -rf build/node* + rm -rf build/gentxs .PHONY: localnet-start localnet-stop @@ -293,7 +294,7 @@ build-operator-img-core: docker-compose -f contrib/terra-operator/docker-compose.build.yml build core --no-cache build-operator-img-node: - @if ! docker image inspect public.ecr.aws/p5q2r9h7/core:alpine3.17 &>/dev/null ; then make build-operator-img-core ; fi + @if ! docker image inspect public.ecr.aws/classic-terra/core:${NODE_VERSION} &>/dev/null ; then make build-operator-img-core ; fi docker-compose -f contrib/terra-operator/docker-compose.build.yml build node --no-cache .PHONY: build-operator-img-all build-operator-img-core build-operator-img-node \ No newline at end of file diff --git a/cmd/terrad/testnet.go b/cmd/terrad/testnet.go index f16af3c4b..d09756b6b 100644 --- a/cmd/terrad/testnet.go +++ b/cmd/terrad/testnet.go @@ -9,6 +9,7 @@ import ( "net" "os" "path/filepath" + "time" "github.com/spf13/cobra" tmconfig "github.com/tendermint/tendermint/config" @@ -32,6 +33,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" core "github.com/classic-terra/core/types" @@ -119,8 +121,8 @@ func InitTestnet( chainID = "chain-" + tmrand.NewRand().Str(6) } - nodeIDs := make([]string, 6) - valPubKeys := make([]cryptotypes.PubKey, 6) + nodeIDs := make([]string, numValidators) + valPubKeys := make([]cryptotypes.PubKey, numValidators) _, appConfig := initAppConfig() terraappConfig := appConfig.(TerraAppConfig) @@ -140,9 +142,7 @@ func InitTestnet( inBuf := bufio.NewReader(cmd.InOrStdin()) // generate private keys, node IDs, and initial transactions - // can have 6 validators at most - // but need to go through all nodes to initialize config and such - for i := 0; i < 6; i++ { + for i := 0; i < numValidators; i++ { nodeDirName := fmt.Sprintf("%s%d", nodeDirPrefix, i) nodeDir := filepath.Join(outputDir, nodeDirName, nodeDaemonHome) gentxsDir := filepath.Join(outputDir, "gentxs") @@ -220,43 +220,40 @@ func InitTestnet( genAccounts = append(genAccounts, authtypes.NewBaseAccount(addr, nil, 0, 0)) valTokens := sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction) - // create gentxs only for numValidators - if i < numValidators { - // create the validator for node i - createValMsg, err := stakingtypes.NewMsgCreateValidator( - sdk.ValAddress(addr), - valPubKeys[i], - sdk.NewCoin(core.MicroLunaDenom, valTokens), - stakingtypes.NewDescription(nodeDirName, "", "", "", ""), - stakingtypes.NewCommissionRates(sdk.OneDec(), sdk.OneDec(), sdk.OneDec()), - sdk.OneInt(), - ) - if err != nil { - return err - } + // create the validator for node i + createValMsg, err := stakingtypes.NewMsgCreateValidator( + sdk.ValAddress(addr), + valPubKeys[i], + sdk.NewCoin(core.MicroLunaDenom, valTokens), + stakingtypes.NewDescription(nodeDirName, "", "", "", ""), + stakingtypes.NewCommissionRates(sdk.OneDec(), sdk.OneDec(), sdk.OneDec()), + sdk.OneInt(), + ) + if err != nil { + return err + } - // create gentx (create validator) and write to file - txBuilder := clientCtx.TxConfig.NewTxBuilder() - if err := txBuilder.SetMsgs(createValMsg); err != nil { - return err - } - txBuilder.SetMemo(memo) - txFactory := tx.Factory{} - txFactory = txFactory. - WithChainID(chainID). - WithMemo(memo). - WithKeybase(kb). - WithTxConfig(clientCtx.TxConfig) - if err := tx.Sign(txFactory, nodeDirName, txBuilder, true); err != nil { - return err - } - txBz, err := clientCtx.TxConfig.TxJSONEncoder()(txBuilder.GetTx()) - if err != nil { - return err - } - if err := writeFile(fmt.Sprintf("%v.json", nodeDirName), gentxsDir, txBz); err != nil { - return err - } + // create gentx (create validator) and write to file + txBuilder := clientCtx.TxConfig.NewTxBuilder() + if err := txBuilder.SetMsgs(createValMsg); err != nil { + return err + } + txBuilder.SetMemo(memo) + txFactory := tx.Factory{} + txFactory = txFactory. + WithChainID(chainID). + WithMemo(memo). + WithKeybase(kb). + WithTxConfig(clientCtx.TxConfig) + if err := tx.Sign(txFactory, nodeDirName, txBuilder, true); err != nil { + return err + } + txBz, err := clientCtx.TxConfig.TxJSONEncoder()(txBuilder.GetTx()) + if err != nil { + return err + } + if err := writeFile(fmt.Sprintf("%v.json", nodeDirName), gentxsDir, txBz); err != nil { + return err } // write config file app.toml @@ -303,8 +300,19 @@ func initGenFiles( clientCtx.Codec.MustUnmarshalJSON(appGenState[banktypes.ModuleName], &bankGenState) bankGenState.Balances = genBalances + totalSupply := sdk.NewCoins() + for _, balance := range bankGenState.Balances { + totalSupply = totalSupply.Add(balance.Coins...) + } + bankGenState.Supply = totalSupply appGenState[banktypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&bankGenState) + // set gov in the genesis state + var govGenState govtypes.GenesisState + clientCtx.Codec.MustUnmarshalJSON(appGenState[govtypes.ModuleName], &govGenState) + govGenState.VotingParams.VotingPeriod = time.Second * 30 + appGenState[govtypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&govGenState) + appGenStateJSON, err := json.MarshalIndent(appGenState, "", " ") if err != nil { return err @@ -317,7 +325,7 @@ func initGenFiles( } // generate empty genesis files for each validator and save - for i := 0; i < 6; i++ { + for i := 0; i < numValidators; i++ { if err := genDoc.SaveAs(genFiles[i]); err != nil { return err } @@ -333,7 +341,7 @@ func collectGenFiles( var appState json.RawMessage genTime := tmtime.Now() - for i := 0; i < 6; i++ { + for i := 0; i < numValidators; i++ { nodeDirName := fmt.Sprintf("%s%d", nodeDirPrefix, i) nodeDir := filepath.Join(outputDir, nodeDirName, nodeDaemonHome) gentxsDir := filepath.Join(outputDir, "gentxs") diff --git a/contrib/localnet/Makefile b/contrib/localnet/Makefile index 46055e812..609b6e9f8 100644 --- a/contrib/localnet/Makefile +++ b/contrib/localnet/Makefile @@ -4,6 +4,6 @@ terrad-env: docker build --platform linux/amd64 --no-cache --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --tag classic-terra/terrad-env terrad-env terrad-upgrade-env: - docker build --platform linux/amd64 --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --build-arg entrypoint=cosmovisor-entrypoint.sh --tag classic-terra/terrad-upgrade-env terrad-env + docker build --platform linux/amd64 --no-cache --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --build-arg entrypoint=cosmovisor-entrypoint.sh --tag classic-terra/terrad-upgrade-env terrad-env .PHONY: all terrad-env terrad-upgrade-env diff --git a/contrib/localnet/deposit-test.sh b/contrib/localnet/deposit-test.sh index d8832e943..ce5b78705 100755 --- a/contrib/localnet/deposit-test.sh +++ b/contrib/localnet/deposit-test.sh @@ -2,7 +2,7 @@ # # start network -TESTNET_NVAL=6 TESTNET_VOTING_PERIOD=40s make clean localnet-start +make clean localnet-start # # convenience diff --git a/contrib/terra-operator/docker-compose.build.yml b/contrib/terra-operator/docker-compose.build.yml index d2581df80..444452b11 100644 --- a/contrib/terra-operator/docker-compose.build.yml +++ b/contrib/terra-operator/docker-compose.build.yml @@ -2,7 +2,7 @@ version: '3.8' services: core: - image: public.ecr.aws/p5q2r9h7/core:alpine3.17 + image: public.ecr.aws/classic-terra/core:alpine3.17 build: context: ../.. dockerfile: Dockerfile @@ -11,12 +11,12 @@ services: labels: - "description=Contains the terrad binary" node: - image: public.ecr.aws/p5q2r9h7/node:alpine3.17 + image: public.ecr.aws/classic-terra/node:alpine3.17 build: context: . dockerfile: Dockerfile args: - base_image: public.ecr.aws/p5q2r9h7/core + base_image: public.ecr.aws/classic-terra/core version: alpine3.17 platforms: - "linux/amd64" diff --git a/contrib/terra-operator/docker-compose.node.yml b/contrib/terra-operator/docker-compose.node.yml index c8d44db7d..cc5d61729 100644 --- a/contrib/terra-operator/docker-compose.node.yml +++ b/contrib/terra-operator/docker-compose.node.yml @@ -3,7 +3,7 @@ version: '3.8' services: node: container_name: node - image: public.ecr.aws/p5q2r9h7/node:alpine3.17 + image: public.ecr.aws/classic-terra/node:alpine3.17 platform: linux/amd64 environment: - CHAINID=test diff --git a/contrib/updates/docker-compose.yml b/contrib/updates/docker-compose.yml index 7da586e74..9a8a9d5ed 100644 --- a/contrib/updates/docker-compose.yml +++ b/contrib/updates/docker-compose.yml @@ -3,13 +3,14 @@ version: '3' services: terradnode0: container_name: terradnode0 + platform: linux/amd64 image: "classic-terra/terrad-upgrade-env" ports: - "9090:9090" - "26656-26657:26656-26657" environment: - ID=0 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log - DAEMON_HOME=/terrad/node0/terrad - DAEMON_NAME=terrad - DAEMON_RESTART_AFTER_UPGRADE=true @@ -21,13 +22,14 @@ services: terradnode1: container_name: terradnode1 + platform: linux/amd64 image: "classic-terra/terrad-upgrade-env" ports: - "9091:9090" - "26659-26660:26656-26657" environment: - ID=1 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log - DAEMON_HOME=/terrad/node1/terrad - DAEMON_NAME=terrad - DAEMON_RESTART_AFTER_UPGRADE=true @@ -39,10 +41,11 @@ services: terradnode2: container_name: terradnode2 + platform: linux/amd64 image: "classic-terra/terrad-upgrade-env" environment: - ID=2 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log - DAEMON_HOME=/terrad/node2/terrad - DAEMON_NAME=terrad - DAEMON_RESTART_AFTER_UPGRADE=true @@ -57,10 +60,11 @@ services: terradnode3: container_name: terradnode3 + platform: linux/amd64 image: "classic-terra/terrad-upgrade-env" environment: - ID=3 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log - DAEMON_HOME=/terrad/node3/terrad - DAEMON_NAME=terrad - DAEMON_RESTART_AFTER_UPGRADE=true @@ -72,7 +76,62 @@ services: networks: localnet: ipv4_address: 192.168.10.5 + terradnode4: + container_name: terradnode4 + platform: linux/amd64 + image: "classic-terra/terrad-upgrade-env" + environment: + - ID=4 + - LOG=terrad.log + - DAEMON_HOME=/terrad/node4/terrad + - DAEMON_NAME=terrad + - DAEMON_RESTART_AFTER_UPGRADE=true + ports: + - "9094:9090" + - "26665-26666:26656-26657" + volumes: + - ../../build:/terrad:Z + networks: + localnet: + ipv4_address: 192.168.10.6 + + terradnode5: + container_name: terradnode5 + platform: linux/amd64 + image: "classic-terra/terrad-upgrade-env" + environment: + - ID=5 + - LOG=terrad.log + - DAEMON_HOME=/terrad/node5/terrad + - DAEMON_NAME=terrad + - DAEMON_RESTART_AFTER_UPGRADE=true + ports: + - "9095:9090" + - "26667-26668:26656-26657" + volumes: + - ../../build:/terrad:Z + networks: + localnet: + ipv4_address: 192.168.10.7 + terradnode6: + container_name: terradnode6 + platform: linux/amd64 + image: "classic-terra/terrad-upgrade-env" + environment: + - ID=6 + - LOG=terrad.log + - DAEMON_HOME=/terrad/node6/terrad + - DAEMON_NAME=terrad + - DAEMON_RESTART_AFTER_UPGRADE=true + ports: + - "9096:9090" + - "26669-26670:26656-26657" + volumes: + - ../../build:/terrad:Z + networks: + localnet: + ipv4_address: 192.168.10.8 networks: localnet: driver: bridge diff --git a/contrib/updates/prepare_cosmovisor.sh b/contrib/updates/prepare_cosmovisor.sh index ee7533bcd..297db7063 100644 --- a/contrib/updates/prepare_cosmovisor.sh +++ b/contrib/updates/prepare_cosmovisor.sh @@ -5,9 +5,11 @@ # These fields should be fetched automatically in the future # Need to do more upgrade to see upgrade patterns -OLD_VERSION=v1.0.5 +OLD_VERSION=v1.1.0 SOFTWARE_UPGRADE_NAME=$(ls -td -- ./app/upgrades/* | head -n 1 | cut -d'/' -f4) BUILDDIR=$1 +TESTNET_NVAL=$2 +TESTNET_CHAINID=$3 # check if BUILDDIR is set if [ -z "$BUILDDIR" ]; then @@ -33,7 +35,7 @@ if [ ! -f "$BUILDDIR/old/terrad" ]; then docker rm old-temp fi -# prepare cosmovisor config in four nodes +# prepare cosmovisor config in TESTNET_NVAL nodes if [ ! -f "$BUILDDIR/node0/terrad/config/genesis.json" ]; then docker run --rm \ --user $(id -u):$(id -g) \ -v $BUILDDIR:/terrad:Z \ @@ -41,10 +43,11 @@ if [ ! -f "$BUILDDIR/node0/terrad/config/genesis.json" ]; then docker run --rm \ -v /etc/passwd:/etc/passwd:ro \ -v /etc/shadow:/etc/shadow:ro \ --entrypoint /terrad/old/terrad \ - classic-terra/terrad-upgrade-env testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test --home /terrad; + --platform linux/amd64 \ + classic-terra/terrad-upgrade-env testnet --v $TESTNET_NVAL --chain-id $TESTNET_CHAINID -o . --starting-ip-address 192.168.10.2 --keyring-backend=test --home=temp; \ fi -for i in {0..3}; do +for (( i=0; i<$TESTNET_NVAL; i++ )); do CURRENT=$BUILDDIR/node$i/terrad # change gov params voting_period @@ -60,6 +63,7 @@ for i in {0..3}; do -e DAEMON_NAME=terrad \ -e DAEMON_RESTART_AFTER_UPGRADE=true \ --entrypoint /terrad/cosmovisor \ + --platform linux/amd64 \ classic-terra/terrad-upgrade-env init /terrad/old/terrad mkdir -p $CURRENT/cosmovisor/upgrades/$SOFTWARE_UPGRADE_NAME/bin cp $BUILDDIR/terrad $CURRENT/cosmovisor/upgrades/$SOFTWARE_UPGRADE_NAME/bin diff --git a/contrib/updates/upgrade-test.sh b/contrib/updates/upgrade-test.sh index e013fa7a7..f45f81dbc 100644 --- a/contrib/updates/upgrade-test.sh +++ b/contrib/updates/upgrade-test.sh @@ -4,6 +4,7 @@ SOFTWARE_UPGRADE_NAME=$(ls -td -- ./app/upgrades/* | head -n 1 | cut -d'/' -f4) NODE1_HOME=node1/terrad BINARY_OLD="docker exec terradnode1 ./terrad" +TESTNET_NVAL=${1:-7} # sleep to wait for localnet to come up sleep 10 @@ -21,8 +22,8 @@ $BINARY_OLD tx gov deposit 1 "20000000uluna" --from node1 --keyring-backend test sleep 5 -# loop from 0 to 3 -for i in {0..3}; do +# loop from 0 to TESTNET_NVAL +for (( i=0; i<$TESTNET_NVAL; i++ )); do # check if docker for node i is running if [[ $(docker ps -a | grep terradnode$i | wc -l) -eq 1 ]]; then $BINARY_OLD tx gov vote 1 yes --from node$i --keyring-backend test --chain-id $CHAIN_ID --home "node$i/terrad" -y @@ -44,18 +45,20 @@ while true; do fi done -sleep 10 +sleep 40 # check all nodes are online after upgrade -for i in {0..3}; do +for (( i=0; i<$TESTNET_NVAL; i++ )); do if [[ $(docker ps -a | grep terradnode$i | wc -l) -eq 1 ]]; then docker exec terradnode$i ./terrad status --home "node$i/terrad" if [[ "${PIPESTATUS[0]}" != "0" ]]; then echo "node$i is not online" + docker logs terradnode$i exit 1 fi else echo "terradnode$i is not running" + docker logs terradnode$i exit 1 fi done \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8e544e29c..c5d35d355 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,11 +6,12 @@ services: container_name: terradnode0 image: classic-terra/terrad-env ports: + - "1317:1317" - "9090:9090" - "26656-26657:26656-26657" environment: - ID=0 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log volumes: - ./build:/terrad:Z networks: @@ -22,11 +23,12 @@ services: container_name: terradnode1 image: classic-terra/terrad-env ports: + - "1318:1317" - "9091:9090" - "26659-26660:26656-26657" environment: - ID=1 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log volumes: - ./build:/terrad:Z networks: @@ -39,8 +41,9 @@ services: image: classic-terra/terrad-env environment: - ID=2 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log ports: + - "1319:1317" - "9092:9090" - "26661-26662:26656-26657" volumes: @@ -55,8 +58,9 @@ services: image: classic-terra/terrad-env environment: - ID=3 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log ports: + - "1320:1317" - "9093:9090" - "26663-26664:26656-26657" volumes: @@ -71,8 +75,9 @@ services: image: classic-terra/terrad-env environment: - ID=4 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log ports: + - "1321:1317" - "9094:9090" - "26665-26666:26656-26657" volumes: @@ -87,8 +92,9 @@ services: image: classic-terra/terrad-env environment: - ID=5 - - LOG=$${LOG:-terrad.log} + - LOG=terrad.log ports: + - "1322:1317" - "9095:9090" - "26667-26668:26656-26657" volumes: @@ -97,6 +103,23 @@ services: localnet: ipv4_address: 192.168.10.7 + terradnode6: + platform: linux/amd64 + container_name: terradnode6 + image: classic-terra/terrad-env + environment: + - ID=6 + - LOG=terrad.log + ports: + - "1323:1317" + - "9096:9090" + - "26669-26670:26656-26657" + volumes: + - ./build:/terrad:Z + networks: + localnet: + ipv4_address: 192.168.10.8 + networks: localnet: driver: bridge diff --git a/go.mod b/go.mod index 94f9eca65..0394f730e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ module github.com/classic-terra/core require ( github.com/CosmWasm/wasmvm v0.16.7 - github.com/cosmos/cosmos-sdk v0.44.8 + github.com/cosmos/cosmos-sdk v0.45.13 github.com/cosmos/gogoproto v1.4.4 github.com/cosmos/ibc-go v1.3.1 github.com/gogo/protobuf v1.3.3 diff --git a/scripts/upgrade-test.sh b/scripts/upgrade-test.sh index 3f0088924..30ecfa4ac 100755 --- a/scripts/upgrade-test.sh +++ b/scripts/upgrade-test.sh @@ -1,7 +1,7 @@ #!/bin/bash # $(curl --silent "https://api.github.com/repos/classic-terra/core/releases/latest" | jq -r '.tag_name') -OLD_VERSION=v1.0.5 +OLD_VERSION=v1.1.0 UPGRADE_HEIGHT=20 HOME=mytestnet ROOT=$(pwd)