Skip to content

Commit

Permalink
chore: bump Gravity-Bridge (#1412)
Browse files Browse the repository at this point in the history 
* chore: bump Gravity-Bridge

* skip eth <-> umee tests due to eth PoS migration

* set pf gas_adjustment to 1

* disabled peggo and eth resources due to PoS migration

Co-authored-by: Rafael Tenfen <rafaeltenfen.rt@gmail.com>
  • Loading branch information
@robert-zaremba @RafilxTenfen
robert-zaremba and RafilxTenfen committed Sep 19, 2022
1 parent fd05708 commit fea1e4c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 28 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/cosmos/cosmos-proto v1.0.0-alpha7
github.com/cosmos/cosmos-sdk v0.46.1
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/ibc-go/v5 v5.0.0-rc1.0.20220831174724-8045fcccbd30
github.com/cosmos/ibc-go/v5 v5.0.0-rc2
github.com/ethereum/go-ethereum v1.10.25
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
Expand Down Expand Up @@ -317,7 +317,7 @@ require (
)

replace (
github.com/Gravity-Bridge/Gravity-Bridge/module => github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220831213229-254615a7be1d
github.com/Gravity-Bridge/Gravity-Bridge/module => github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-1
github.com/cosmos/cosmos-sdk => github.com/umee-network/cosmos-sdk v0.46.1-umee
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4
github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
github.com/cosmos/iavl v0.19.1 h1:3gaq9b6SjiB0KBTygRnAvEGml2pQlu1TH8uma5g63Ys=
github.com/cosmos/iavl v0.19.1/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
github.com/cosmos/ibc-go/v5 v5.0.0-rc1.0.20220831174724-8045fcccbd30 h1:8K7TsPUeiWYdhA1xPUTeR96AfdzXkLAkB0FWmxafbXA=
github.com/cosmos/ibc-go/v5 v5.0.0-rc1.0.20220831174724-8045fcccbd30/go.mod h1:Wqsguq98Iuns8tgTv8+xaGYbC+Q8zJfbpjzT6IgMJbs=
github.com/cosmos/ibc-go/v5 v5.0.0-rc2 h1:7rGkZwojUwK1Dvgze3ZP5K1upIKygudxU3WaeFFU2ts=
github.com/cosmos/ibc-go/v5 v5.0.0-rc2/go.mod h1:Wqsguq98Iuns8tgTv8+xaGYbC+Q8zJfbpjzT6IgMJbs=
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
Expand Down Expand Up @@ -1293,8 +1293,8 @@ github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iL
github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI=
github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220831213229-254615a7be1d h1:IYNYXNHyJBerOuFsPy9WuWOD5VoBuCkH/Y+XNCxb8iA=
github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220831213229-254615a7be1d/go.mod h1:qSTpO1Yz4mdRELKGiOUvbNZkYUioDtLJ/jYhBqgRrO8=
github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-1 h1:a4OGAGfmZ+jcHH//HuQCLeDYpLy3282t3deVKRPt+RU=
github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-1/go.mod h1:UN4ehDuy5PA1YY7juvBMMulyiKv7uBMLUbTV/vONzH0=
github.com/umee-network/bech32-ibc v0.3.0-rc1.0.20220831212913-42baad053f6e h1:RCxnO359ieolUDIT1cF7Ic3ms4epgmZxzNiz1a2IBeU=
github.com/umee-network/bech32-ibc v0.3.0-rc1.0.20220831212913-42baad053f6e/go.mod h1:Prssr3u1p2ICcgkhtMaX55NZv7A7E2ernO6fKrpolSg=
github.com/umee-network/cosmos-sdk v0.46.1-umee h1:htt48oCN/i0An5z8AS8ttXU3Dk7fiE/gWNvwQGGOJgs=
Expand Down
2 changes: 1 addition & 1 deletion price-feeder/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ require (
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v0.19.1 // indirect
github.com/cosmos/ibc-go/v5 v5.0.0-rc1.0.20220831174724-8045fcccbd30 // indirect
github.com/cosmos/ibc-go/v5 v5.0.0-rc2 // indirect
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
github.com/cosmos/ledger-go v0.9.2 // indirect
github.com/creachadair/taskgroup v0.3.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions price-feeder/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4
github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
github.com/cosmos/iavl v0.19.1 h1:3gaq9b6SjiB0KBTygRnAvEGml2pQlu1TH8uma5g63Ys=
github.com/cosmos/iavl v0.19.1/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
github.com/cosmos/ibc-go/v5 v5.0.0-rc1.0.20220831174724-8045fcccbd30 h1:8K7TsPUeiWYdhA1xPUTeR96AfdzXkLAkB0FWmxafbXA=
github.com/cosmos/ibc-go/v5 v5.0.0-rc1.0.20220831174724-8045fcccbd30/go.mod h1:Wqsguq98Iuns8tgTv8+xaGYbC+Q8zJfbpjzT6IgMJbs=
github.com/cosmos/ibc-go/v5 v5.0.0-rc2 h1:7rGkZwojUwK1Dvgze3ZP5K1upIKygudxU3WaeFFU2ts=
github.com/cosmos/ibc-go/v5 v5.0.0-rc2/go.mod h1:Wqsguq98Iuns8tgTv8+xaGYbC+Q8zJfbpjzT6IgMJbs=
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
Expand Down
35 changes: 18 additions & 17 deletions tests/e2e/e2e_setup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,12 @@ func (s *IntegrationTestSuite) SetupSuite() {
s.dkrNet, err = s.dkrPool.CreateNetwork(fmt.Sprintf("%s-testnet", s.chain.id))
s.Require().NoError(err)

var useGanache bool
if str := os.Getenv("UMEE_E2E_USE_GANACHE"); len(str) > 0 {
useGanache, err = strconv.ParseBool(str)
s.Require().NoError(err)
}
s.T().Logf("Ethereum and peggo are disable due to Ethereum PoS migration and PoW fork")
// var useGanache bool
// if str := os.Getenv("UMEE_E2E_USE_GANACHE"); len(str) > 0 {
// useGanache, err = strconv.ParseBool(str)
// s.Require().NoError(err)
// }

// The boostrapping phase is as follows:
//
Expand All @@ -107,20 +108,20 @@ func (s *IntegrationTestSuite) SetupSuite() {
// 8. Deploy the Gravity Bridge contract.
// 9. Create and start Peggo (orchestrator) containers.
s.initNodes()
if useGanache {
s.runGanacheContainer()
} else {
s.initEthereum()
s.runEthContainer()
}
// if useGanache {
// s.runGanacheContainer()
// } else {
// s.initEthereum()
// s.runEthContainer()
// }
s.initGenesis()
s.initValidatorConfigs()
s.runValidators()
s.runPriceFeeder()
s.runGaiaNetwork()
s.runIBCRelayer()
s.runContractDeployment()
s.runOrchestrators()
// s.runContractDeployment()
// s.runOrchestrators()
}

func (s *IntegrationTestSuite) TearDownSuite() {
Expand All @@ -135,7 +136,7 @@ func (s *IntegrationTestSuite) TearDownSuite() {

s.T().Log("tearing down e2e integration test suite...")

s.Require().NoError(s.dkrPool.Purge(s.ethResource))
// s.Require().NoError(s.dkrPool.Purge(s.ethResource))
s.Require().NoError(s.dkrPool.Purge(s.gaiaResource))
s.Require().NoError(s.dkrPool.Purge(s.hermesResource))
s.Require().NoError(s.dkrPool.Purge(s.priceFeederResource))
Expand All @@ -144,9 +145,9 @@ func (s *IntegrationTestSuite) TearDownSuite() {
s.Require().NoError(s.dkrPool.Purge(vc))
}

for _, oc := range s.orchResources {
s.Require().NoError(s.dkrPool.Purge(oc))
}
// for _, oc := range s.orchResources {
// s.Require().NoError(s.dkrPool.Purge(oc))
// }

s.Require().NoError(s.dkrPool.RemoveNetwork(s.dkrNet))

Expand Down
6 changes: 6 additions & 0 deletions tests/e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,14 @@ func (s *IntegrationTestSuite) TestIBCTokenTransfer() {

var ibcStakeERC20Addr string
s.Run("deploy_stake_erc20 ibcStakeERC20Addr", func() {
s.T().Skip("paused due to Ethereum PoS migration and PoW fork")
s.Require().NotEmpty(ibcStakeDenom)
ibcStakeERC20Addr = s.deployERC20Token(ibcStakeDenom)
})

// send 300 stake tokens from Umee to Ethereum
s.Run("send_stake_tokens_to_eth", func() {
s.T().Skip("paused due to Ethereum PoS migration and PoW fork")
umeeValIdxSender := 0
orchestratorIdxReceiver := 1
amount := sdk.NewCoin(ibcStakeDenom, math.NewInt(300))
Expand All @@ -70,6 +72,7 @@ func (s *IntegrationTestSuite) TestIBCTokenTransfer() {

// send 300 stake tokens from Ethereum back to Umee
s.Run("send_stake_tokens_from_eth", func() {
s.T().Skip("paused due to Ethereum PoS migration and PoW fork")
umeeValIdxReceiver := 0
orchestratorIdxSender := 1
amount := uint64(300)
Expand All @@ -79,6 +82,7 @@ func (s *IntegrationTestSuite) TestIBCTokenTransfer() {
}

func (s *IntegrationTestSuite) TestPhotonTokenTransfers() {
s.T().Skip("paused due to Ethereum PoS migration and PoW fork")
// deploy photon ERC20 token contact
var photonERC20Addr string
s.Run("deploy_photon_erc20", func() {
Expand All @@ -98,6 +102,7 @@ func (s *IntegrationTestSuite) TestPhotonTokenTransfers() {

// send 100 photon tokens from Ethereum back to Umee
s.Run("send_photon_tokens_from_eth", func() {
s.T().Skip("paused due to Ethereum PoS migration and PoW fork")
umeeValIdxReceiver := 0
orchestratorIdxSender := 1
amount := uint64(100)
Expand All @@ -107,6 +112,7 @@ func (s *IntegrationTestSuite) TestPhotonTokenTransfers() {
}

func (s *IntegrationTestSuite) TestUmeeTokenTransfers() {
s.T().Skip("paused due to Ethereum PoS migration and PoW fork")
// deploy umee ERC20 token contract
var umeeERC20Addr string
s.Run("deploy_umee_erc20", func() {
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/scripts/price_feeder_bootstrap.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ touch /root/.price-feeder/config.toml

# setup price-feeder configuration
tee /root/.price-feeder/config.toml <<EOF
gas_adjustment = 1.5
gas_adjustment = 1
provider_timeout = "5000ms"
[server]
Expand Down Expand Up @@ -70,4 +70,4 @@ global-labels = [["chain-id", "umee-local-testnet"]]
EOF

# start price-feeder
price-feeder /root/.price-feeder/config.toml
price-feeder /root/.price-feeder/config.toml --log-level debug

0 comments on commit fea1e4c

Please sign in to comment.