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.

Sign up for GitHub

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

imp: refactor simapp to more closely resemble the style used in cosmos-sdk #3874

Merged
merged 74 commits into from
Jul 3, 2023
+566 −799
Merged

imp: refactor simapp to more closely resemble the style used in cosmos-sdk #3874

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
6ff5229
begin refactoring simapp in main branch
faddat Jun 17, 2023
dd71e9d
resolve method calls
faddat Jun 17, 2023
3d8e5e8
make the simapp folder resemble upstream's
faddat Jun 17, 2023
3fb55cd
now we are basically in line with upstream
faddat Jun 17, 2023
1d052ec
fix more tests
faddat Jun 17, 2023
c19cde7
use bumped interchaintest
faddat Jun 17, 2023
437b004
use self-referent interchaintest
faddat Jun 17, 2023
ea39d8e
continue to make this simapp mor resemble the sdk's
faddat Jun 18, 2023
b9b7933
buf mod update & fix a call in the capability module
faddat Jun 18, 2023
d444a16
use IBC's NewMemoryStoreKeys
faddat Jun 18, 2023
f91d1f1
add "testingkey"
faddat Jun 18, 2023
7070fc0
more closely follow sdk style
faddat Jun 18, 2023
a7b34be
fix nil scoped ibc keeper
catShaark Jun 18, 2023
ce2a5cb
restore the scoped keepers at the end of app.go
faddat Jun 18, 2023
4a23663
changelog
faddat Jun 18, 2023
1099de8
organize functions as described in PR
faddat Jun 18, 2023
07f93b4
Merge branch 'main' into simapp-refactor
faddat Jun 19, 2023
62966ce
apply gci
faddat Jun 21, 2023
5727edb
Merge remote-tracking branch 'origin/main' into simapp-refactor
faddat Jun 21, 2023
6dce091
revert changes to go.work example
faddat Jun 21, 2023
75a47d7
Merge branch 'main' into simapp-refactor
faddat Jun 21, 2023
e0443a8
Merge branch 'main' into simapp-refactor
faddat Jun 22, 2023
7ea500c
lint docs same as docs-lint pr
faddat Jun 22, 2023
d79b28d
Merge branch 'main' into simapp-refactor
faddat Jun 23, 2023
1087e64
Revert "lint docs same as docs-lint pr"
faddat Jun 23, 2023
8de95ef
remove a change to e2e
faddat Jun 23, 2023
40c8bdc
tidy
faddat Jun 23, 2023
22aa59e
bump interchaintest
faddat Jun 23, 2023
6131eda
remove nft and use the upgrade code
faddat Jun 27, 2023
82f2df3
Merge remote-tracking branch 'origin/main' into simapp-refactor
faddat Jun 27, 2023
fbe043e
remove rosetta
faddat Jun 27, 2023
0b52d7f
remove rosetta
faddat Jun 27, 2023
8d39fbf
remove subspaces for the paramters keeper
faddat Jun 27, 2023
03b0eeb
remove commented out NewTestnetCommand
faddat Jun 27, 2023
750f54b
fix the benchmarking command
faddat Jun 27, 2023
18334f5
revert Marshaler -> Codec
faddat Jun 27, 2023
bebfff4
Merge branch 'main' into simapp-refactor
faddat Jun 27, 2023
956cacb
Merge remote-tracking branch 'origin/main' into simapp-refactor
faddat Jun 28, 2023
3616944
cleanup
faddat Jun 28, 2023
a513786
move upgrades
faddat Jun 28, 2023
e03d5bb
fix simapp
faddat Jun 28, 2023
54321e0
fix simapp (lint)
faddat Jun 28, 2023
873c44e
Update CHANGELOG.md
faddat Jun 28, 2023
2751bed
Update CHANGELOG.md
faddat Jun 28, 2023
e0b3e4a
correct the envprefix
faddat Jun 28, 2023
7fab58e
remove newtestnetworkfixture (used for the testnet command)
faddat Jun 28, 2023
4d8d4e8
remove other unused code
faddat Jun 28, 2023
6bb5abb
supernit: testdata_pulsar -> testdatapb
faddat Jun 28, 2023
ab6c054
remove setup with single validator
faddat Jun 28, 2023
3a4e576
remove home flag check
faddat Jun 28, 2023
e79f6db
remove comment
faddat Jun 28, 2023
b626af1
remove utils.go
faddat Jun 28, 2023
40f00d0
remove state.go
faddat Jun 28, 2023
7c1d24e
rename sm to simulationManager
faddat Jun 28, 2023
42f0eab
remove testingkey
faddat Jun 28, 2023
9a8fc9e
Merge branch 'main' into simapp-refactor
faddat Jun 28, 2023
df4dd56
Update testing/simapp/app.go
faddat Jun 28, 2023
4e23bdc
Merge branch 'simapp-refactor' of https://github.com/notional-labs/ib…
faddat Jun 28, 2023
5012d05
move comments about Seal()
faddat Jun 28, 2023
84751e0
remove changelog entry
faddat Jun 28, 2023
69db274
remove unnecessary comment about upgrade handlers
faddat Jun 28, 2023
9e7c498
godocs for the configurator
faddat Jun 28, 2023
3ed90cc
use "upgrades" package for upgrades.go
faddat Jun 28, 2023
f054d31
Update testing/simapp/sim_test.go
faddat Jun 28, 2023
d13cd9a
Update testing/simapp/app.go
faddat Jun 28, 2023
27ace14
Merge branch 'main' into simapp-refactor
faddat Jun 29, 2023
5f72940
Merge branch 'main' into simapp-refactor
faddat Jul 2, 2023
70fbefe
Update testing/simapp/test_helpers.go
faddat Jul 3, 2023
6ccf86e
lint and restore the sdkmath import
faddat Jul 3, 2023
21c9fa5
don't set simappchainid
faddat Jul 3, 2023
f728dc6
lint
faddat Jul 3, 2023
bfbd16d
Merge branch 'main' into simapp-refactor
faddat Jul 3, 2023
7147671
Merge branch 'main' into simapp-refactor
faddat Jul 3, 2023
8121c6d
Merge branch 'main' into simapp-refactor
Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Improvements

* (simapp) [\#3874](https://github.com/cosmos/ibc-go/pull/3874) Refactor simapp to more closely resemble the style used in cosmos-sdk
faddat marked this conversation as resolved.
Show resolved Hide resolved
* (tests) [\#3138](https://github.com/cosmos/ibc-go/pull/3138) Support benchmarks and fuzz tests through `testing.TB`.

### Features

### Bug Fixes

## [v7.1.0](https://github.com/cosmos/ibc-go/releases/tag/v7.1.0) - 2023-06-09
## [v7.1.0](https://github.com/cosmos/ibc-go/releases/tag/v7.1.0) - 2023-06-09

### Dependencies

Expand All @@ -73,10 +74,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (core/04-channel) [\#3346](https://github.com/cosmos/ibc-go/pull/3346) Properly handle ordered channels in `UnreceivedPackets` query.
* (core/04-channel) [\#3593](https://github.com/cosmos/ibc-go/pull/3593) `SendPacket` now correctly returns `ErrClientNotFound` in favour of `ErrConsensusStateNotFound`.

## [v7.0.1](https://github.com/cosmos/ibc-go/releases/tag/v7.0.1) - 2023-05-25
## [v7.0.1](https://github.com/cosmos/ibc-go/releases/tag/v7.0.1) - 2023-05-25

### Bug Fixes

* [\#3346](https://github.com/cosmos/ibc-go/pull/3346) Properly handle ordered channels in `UnreceivedPackets` query.

## [v7.0.0](https://github.com/cosmos/ibc-go/releases/tag/v7.0.0) - 2023-03-17
Expand Down Expand Up @@ -109,7 +110,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (apps) [\#3149](https://github.com/cosmos/ibc-go/pull/3149) Remove legacy interface function `RandomizedParams`, which is no longer used.
* (light-clients/06-solomachine) [\#2941](https://github.com/cosmos/ibc-go/pull/2941) Remove solomachine header sequence.
* (core) [\#2982](https://github.com/cosmos/ibc-go/pull/2982) Moved the ibc module name into the exported package.

### State Machine Breaking

* (06-solomachine) [\#2744](https://github.com/cosmos/ibc-go/pull/2744) `Misbehaviour.ValidateBasic()` now only enforces that signature data does not match when the signature paths are different.
Expand Down Expand Up @@ -139,27 +140,27 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (modules/core/02-client) [\#1741](https://github.com/cosmos/ibc-go/pull/1741) Emitting a new `upgrade_chain` event upon setting upgrade consensus state.
* (client) [\#724](https://github.com/cosmos/ibc-go/pull/724) `IsRevisionFormat` and `IsClientIDFormat` have been updated to disallow newlines before the dash used to separate the chainID and revision number, and the client type and client sequence.
* (02-client/cli) [\#897](https://github.com/cosmos/ibc-go/pull/897) Remove `GetClientID()` from `Misbehaviour` interface. Submit client misbehaviour cli command requires an explicit client id now.
* (06-solomachine) [\#1972](https://github.com/cosmos/ibc-go/pull/1972) Solo machine implementation of `ZeroCustomFields` fn now panics as the fn is only used for upgrades which solo machine does not support.
* (06-solomachine) [\#1972](https://github.com/cosmos/ibc-go/pull/1972) Solo machine implementation of `ZeroCustomFields` fn now panics as the fn is only used for upgrades which solo machine does not support.
* (light-clients/06-solomachine) Moving `verifyMisbehaviour` function from update.go to misbehaviour_handle.go.
* [\#2434](https://github.com/cosmos/ibc-go/pull/2478) Removed all `TypeMsg` constants
* (modules/core/exported) [\#2539] (https://github.com/cosmos/ibc-go/pull/2539) Removing `GetVersions` from `ConnectionI` interface.
* (modules/core/exported) [\#2539] (<https://github.com/cosmos/ibc-go/pull/2539>) Removing `GetVersions` from `ConnectionI` interface.
faddat marked this conversation as resolved.
Show resolved Hide resolved
* (core/02-connection) [\#2419](https://github.com/cosmos/ibc-go/pull/2419) Add optional proof data to proto definitions of `MsgConnectionOpenTry` and `MsgConnectionOpenAck` for host state machines that are unable to introspect their own consensus state.
* (light-clients/07-tendermint) [\#3046](https://github.com/cosmos/ibc-go/pull/3046) Moved non-verification misbehaviour checks to `CheckForMisbehaviour`.
* (apps/29-fee) [\#2975](https://github.com/cosmos/ibc-go/pull/2975) Adding distribute fee events to ics29.
* (light-clients/07-tendermint) [\#2965](https://github.com/cosmos/ibc-go/pull/2965) Prune expired `07-tendermint` consensus states on duplicate header updates.
* (light-clients) [\#2736](https://github.com/cosmos/ibc-go/pull/2736) Updating `VerifyMembership` and `VerifyNonMembership` methods to use `Path` interface.
* (light-clients) [\#3113](https://github.com/cosmos/ibc-go/pull/3113) Align light client module names.
* (light-clients) [\#3113](https://github.com/cosmos/ibc-go/pull/3113) Align light client module names.

### Features

* (apps/transfer) [\#3079](https://github.com/cosmos/ibc-go/pull/3079) Added authz support for ics20.
* (core/02-client) [\#2824](https://github.com/cosmos/ibc-go/pull/2824) Add genesis migrations for v6 to v7. The migration migrates the solo machine client state definition, removes all solo machine consensus states and removes the localhost client.
* (core/24-host) [\#2856](https://github.com/cosmos/ibc-go/pull/2856) Add `PrefixedClientStorePath` and `PrefixedClientStoreKey` functions to 24-host
* (core/02-client) [\#2819](https://github.com/cosmos/ibc-go/pull/2819) Add automatic in-place store migrations to remove the localhost client and migrate existing solo machine definitions.
* (light-clients/06-solomachine) [\#2826](https://github.com/cosmos/ibc-go/pull/2826) Add `AppModuleBasic` for the 06-solomachine client and remove solo machine type registration from core IBC. Chains must register the `AppModuleBasic` of light clients.
* (light-clients/07-tendermint) [\#2825](https://github.com/cosmos/ibc-go/pull/2825) Add `AppModuleBasic` for the 07-tendermint client and remove tendermint type registration from core IBC. Chains must register the `AppModuleBasic` of light clients.
* (light-clients/06-solomachine) [\#2826](https://github.com/cosmos/ibc-go/pull/2826) Add `AppModuleBasic` for the 06-solomachine client and remove solo machine type registration from core IBC. Chains must register the `AppModuleBasic` of light clients.
* (light-clients/07-tendermint) [\#2825](https://github.com/cosmos/ibc-go/pull/2825) Add `AppModuleBasic` for the 07-tendermint client and remove tendermint type registration from core IBC. Chains must register the `AppModuleBasic` of light clients.
* (light-clients/07-tendermint) [\#2800](https://github.com/cosmos/ibc-go/pull/2800) Add optional in-place store migration function to prune all expired tendermint consensus states.
* (core/24-host) [\#2820](https://github.com/cosmos/ibc-go/pull/2820) Add `MustParseClientStatePath` which parses the clientID from a client state key path.
* (core/24-host) [\#2820](https://github.com/cosmos/ibc-go/pull/2820) Add `MustParseClientStatePath` which parses the clientID from a client state key path.
* (testing/simapp) [\#2842](https://github.com/cosmos/ibc-go/pull/2842) Adding the new upgrade handler for v6 -> v7 to simapp which prunes expired Tendermint consensus states.
* (testing) [\#2829](https://github.com/cosmos/ibc-go/pull/2829) Add `AssertEvents` which asserts events against expected event map.

Expand Down Expand Up @@ -295,7 +296,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Dependencies

* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ICS 23 to v0.9.0.
* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ICS 23 to v0.9.0.
* [\#2944](https://github.com/cosmos/ibc-go/pull/2944) Bump Cosmos SDK to v0.46.7 and Tendermint to v0.34.24.

### State Machine Breaking
Expand Down Expand Up @@ -372,7 +373,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Bug Fixes

* [\#3662](https://github.com/cosmos/ibc-go/pull/3662) Retract v4.1.2 and v4.2.1.
* [\#3662](https://github.com/cosmos/ibc-go/pull/3662) Retract v4.1.2 and v4.2.1.

## [v4.4.1](https://github.com/cosmos/ibc-go/releases/tag/v4.4.1) - 2023-05-25

Expand Down Expand Up @@ -429,7 +430,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Dependencies

* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ICS 23 to v0.9.0.
* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ICS 23 to v0.9.0.

### Improvements

Expand Down Expand Up @@ -469,7 +470,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Dependencies

* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ICS 23 to v0.9.0.
* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ICS 23 to v0.9.0.

### Improvements

Expand Down
21 changes: 11 additions & 10 deletions e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/cosmos/gogoproto v1.4.10
github.com/cosmos/ibc-go/v7 v7.1.0
github.com/cosmos/interchain-accounts v0.5.1
github.com/docker/docker v20.10.19+incompatible
github.com/docker/docker v24.0.1+incompatible
github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230503171723-5e55f37618b7
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.24.0
Expand All @@ -33,7 +33,7 @@ require (
filippo.io/edwards25519 v1.0.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.2 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
github.com/ChainSafe/go-schnorrkel/1 v0.0.0-00010101000000-000000000000 // indirect
github.com/ComposableFi/go-subkey/v2 v2.0.0-tm03420 // indirect
Expand Down Expand Up @@ -72,13 +72,13 @@ require (
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/base58 v1.0.4 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down Expand Up @@ -165,7 +165,7 @@ require (
github.com/pierrec/xxHash v0.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_golang v1.15.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
Expand All @@ -175,7 +175,6 @@ require (
github.com/rs/cors v1.8.3 // indirect
github.com/rs/zerolog v1.29.1 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
Expand All @@ -195,16 +194,16 @@ require (
go.etcd.io/bbolt v1.3.7 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/tools v0.8.0 // indirect
golang.org/x/tools v0.9.3 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.122.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -221,7 +220,7 @@ require (
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.5.0 // indirect
modernc.org/opt v0.1.3 // indirect
modernc.org/sqlite v1.22.1 // indirect
modernc.org/sqlite v1.23.1 // indirect
modernc.org/strutil v1.1.3 // indirect
modernc.org/token v1.1.0 // indirect
nhooyr.io/websocket v1.8.7 // indirect
Expand All @@ -236,6 +235,8 @@ replace (
github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7
)

replace github.com/strangelove-ventures/interchaintest/v7 => github.com/faddat/ibctest/v7 v7.0.0-20230617151442-0f71333f7e9e

// uncomment to use the local version of ibc-go, you will need to run `go mod tidy` in e2e directory.
replace github.com/cosmos/ibc-go/v7 => ../

Expand Down
Loading