Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sdk 50 v2 #716

Merged
merged 28 commits into from
Sep 5, 2023
Merged

Conversation

faddat
Copy link
Contributor

@faddat faddat commented Aug 21, 2023

This PR updates interchaintest to sdk v50.

@faddat
Copy link
Contributor Author

faddat commented Aug 21, 2023

ohhh great point @catShaark -- I'd neglected that step, thank you!

@faddat faddat marked this pull request as ready for review August 21, 2023 22:39
@faddat
Copy link
Contributor Author

faddat commented Aug 22, 2023

@catShaark -- I was able to stop thi linter issue by explicitly specifying that the linter action should:

  • install the latest go
  • use the latest golangci-lint

go.mod Outdated Show resolved Hide resolved
.github/workflows/lint.yml Show resolved Hide resolved
@@ -417,46 +417,6 @@ func (tn *ChainNode) FindTxs(ctx context.Context, height uint64) ([]blockdb.Tx,
}
txs = append(txs, newTx)
}
if len(blockRes.BeginBlockEvents) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should BeginBlockEvents/EndBlockEvents be replaced with FinalizeBlockEvents instead of just removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd need to defer to @catShaark on this. I am not sure, but thanks for the review and bringing this up!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @misko9, I just add the code u request.

@faddat
Copy link
Contributor Author

faddat commented Aug 24, 2023

quick update -- we've gotten this PR:

ready to merge and it.... more or less means that main in ibc-go is ready to go for v50. So, most likely we will release from there instead.

Once that is cut I will get rid of the replace statement in go.mod here.

@boojamya
Copy link
Contributor

boojamya commented Sep 1, 2023

We are really close. @charleenfei, any chance you know why the CI doesn't like the hermes config?

https://github.com/strangelove-ventures/interchaintest/actions/runs/6042953523/job/16399102419?pr=716#step:5:55

failed to configure relayer r for chain gaia-9: exit code 1: The Hermes configuration file at path '/home/hermes/.hermes/config.toml' is invalid, reason: config error: path error: /home/hermes/.hermes/config.toml

@faddat
Copy link
Contributor Author

faddat commented Sep 1, 2023

path error sort of looks like it cannot find the file, but I am not sure that is the actual issue here.

It is also possible that the configuration schema has changed, if you're upgrading hermes from 1.5* to 1.6*

or, did you happen to try the master branch for hermes?

commit log looks like v1.6.0 doesn't have the sauce needed for v50

@charleenfei
Copy link
Contributor

charleenfei commented Sep 1, 2023 via email

@boojamya
Copy link
Contributor

boojamya commented Sep 1, 2023

Module bumped
from: github.com/strangelove-ventures/interchaintest/v7
to: github.com/strangelove-ventures/interchaintest/v8

Right before I merge, I will branch off off a v7.
v8 will be the new main.

@boojamya
Copy link
Contributor

boojamya commented Sep 1, 2023

Note: since this is from a fork, I think it will be easiest to update local-interchain once this is merged.

Reason: I can't properly import the right commit of interchaintest in the go mod.

cc: @Reecepbcups

Copy link
Contributor

@boojamya boojamya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it is good to go! Thanks all!

Boundary tests (which runs IBC conformance tests) are passing on a simd image built with that alpha version of ibc-go v8.

Will update Readme in follow up PR.

@Reecepbcups
Copy link
Member

Ahh, yea this requires an odd go.mod quirk to resolve. Will fix after merge, does not seem I can push up to this PR

},
},
},
relayerVersion: "colin-event-fix",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qq: do you guys have an eta for when the golang relayer going to be updated with the changes in @colin-axner's image?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just approved colin's pr! should be merged once CI passes

@colin-axner
Copy link
Contributor

colin-axner commented Sep 4, 2023

We have a test which uses UnsafeResetAll() and it needs to be updated like so:

diff --git a/chain/cosmos/chain_node.go b/chain/cosmos/chain_node.go
index 623f37c..02bcb50 100644
--- a/chain/cosmos/chain_node.go
+++ b/chain/cosmos/chain_node.go
@@ -1055,7 +1055,7 @@ func (tn *ChainNode) UnsafeResetAll(ctx context.Context) error {
        tn.lock.Lock()
        defer tn.lock.Unlock()
 
-       _, _, err := tn.ExecBin(ctx, "unsafe-reset-all")
+       _, _, err := tn.ExecBin(ctx, "comet", "unsafe-reset-all")
        return err
 }

Is there a way we can handle backwards compatibility here? Do we need to?

@Reecepbcups
Copy link
Member

Reecepbcups commented Sep 5, 2023

@colin-axner Yes, we do need to handle backwards compatibility here.

After this PR is merged, I can use the UseNewGenesisCommand bool to toggle the cmd format for unsafe-reset-all as well

@boojamya boojamya merged commit d39b77e into strangelove-ventures:main Sep 5, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants