From dbd24ccbf5bd51b3bd596589cff7273dbcc57832 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Thu, 12 Jan 2023 18:37:34 +0800 Subject: [PATCH] rebase develop branch --- deployment/localup/localup.sh | 3 --- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/deployment/localup/localup.sh b/deployment/localup/localup.sh index f9b7b802a..4b5d3d8a4 100644 --- a/deployment/localup/localup.sh +++ b/deployment/localup/localup.sh @@ -51,9 +51,6 @@ function generate_genesis() { ${bin} add-genesis-account $relayer_addr ${GENESIS_ACCOUNT_BALANCE}${STAKING_BOND_DENOM} --home ${workspace}/.local/validator${i} done - # init balance for cross chain module -# ${bin} add-genesis-account 0xB73C0Aac4C1E606C6E495d848196355e6CB30381 ${GENESIS_ACCOUNT_BALANCE}${STAKING_BOND_DENOM} --home ${workspace}/.local/validator${i} - rm -rf ${workspace}/.local/validator${i}/config/gentx/ validatorAddr=${validator_addrs[$i]} diff --git a/go.mod b/go.mod index 829524630..b1dc9d685 100644 --- a/go.mod +++ b/go.mod @@ -227,7 +227,7 @@ require ( replace ( github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 - github.com/cosmos/cosmos-sdk => github.com/bnb-chain/inscription-cosmos-sdk v0.0.2-0.20230111075816-6388dc7851c5 + github.com/cosmos/cosmos-sdk => github.com/bnb-chain/inscription-cosmos-sdk v0.0.2-0.20230111084018-da42c763d4ae github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/tendermint/tendermint => github.com/bnb-chain/inscription-tendermint v0.0.1 ) diff --git a/go.sum b/go.sum index 1d9c1d1b5..1f9e98fec 100644 --- a/go.sum +++ b/go.sum @@ -218,8 +218,8 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/bnb-chain/inscription-cosmos-sdk v0.0.2-0.20230111075816-6388dc7851c5 h1:eVqBChFaqOcSwKiew7LNR5r9ehDuMOkKx7+8s2ts72k= -github.com/bnb-chain/inscription-cosmos-sdk v0.0.2-0.20230111075816-6388dc7851c5/go.mod h1:bRLRocojk6Dkiiz91gatNKbVvyc1ay/ycugoQFhVTQ4= +github.com/bnb-chain/inscription-cosmos-sdk v0.0.2-0.20230111084018-da42c763d4ae h1:nSxqHQgLf11Y0WNvop8WyTmnNix6AcckgrkrjHoDAiA= +github.com/bnb-chain/inscription-cosmos-sdk v0.0.2-0.20230111084018-da42c763d4ae/go.mod h1:bRLRocojk6Dkiiz91gatNKbVvyc1ay/ycugoQFhVTQ4= github.com/bnb-chain/inscription-tendermint v0.0.1 h1:E2/QFh9gILGaW5bHNBrZcUvcaUL1SLxeP5WJ3SGQU8c= github.com/bnb-chain/inscription-tendermint v0.0.1/go.mod h1:/v9z9F6cq0+f7EGG92lYSLBcPYQDILoK91X8YM28hWo= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=