chore(strv2): Merge main back into feature branch #2518

facs95 · 2024-04-28T22:06:22Z

Description

Upstream the latest of main with STRv2. Its a huge PR so its very hard to review but please pay close attention to

*/migrate.go files
state_transition.go
./x/erc20/*

NOTE: Upgrade tests are suppose to fail

Closes: #XXXX

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

tackled an existing issue or discussed with a team member
left instructions on how to review the changes
targeted the correct branch (see PR Targeting)

Reviewers Checklist

All items are required.
Please add a note if the item is not applicable
and please add your handle next to the items reviewed
if you only reviewed selected items.

I have...

added a relevant changelog entry to the Unreleased section in CHANGELOG.md
confirmed all author checklist items have been addressed
confirmed that this PR does not change production code
reviewed content
tested instructions (if applicable)
confirmed all CI checks have passed

* improve readibility and add safety measure * remove unnecessary util * add changelog entry

chore(deps): update docker dep

…s/nix_tests/hardhat (#2419) build(deps-dev): bump follow-redirects in /tests/nix_tests/hardhat Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com>

) * build(deps): bump github.com/onsi/ginkgo/v2 from 2.16.0 to 2.17.0 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.16.0 to 2.17.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.16.0...v2.17.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * gomod2nix generate --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com>

…o 24.0.9+incompatible (#2426)

Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

* build(deps): bump github.com/onsi/gomega from 1.31.1 to 1.32.0 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.31.1 to 1.32.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.31.1...v1.32.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * gomod2nix generate --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com>

Signed-off-by: JohnEndson <jiayuzhen@outlook.com>

change legal mail

* chore(docs): updating safu policy * chore: changelog updated * Update CHANGELOG.md Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com> * Update CHANGELOG.md --------- Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com>

) * build(deps): bump github.com/onsi/ginkgo/v2 from 2.17.0 to 2.17.1 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.17.0 to 2.17.1. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.17.0...v2.17.1) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * gomod2nix generate --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>

* only use os mail address for inquiries * add missing dot

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

…2452) Bumps golang from 1.22.1-alpine3.18 to 1.22.2-alpine3.18. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

…s/hardhat (#2456) build(deps-dev): bump undici in /tests/nix_tests/hardhat Bumps [undici](https://github.com/nodejs/undici) from 5.28.3 to 5.28.4. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.3...v5.28.4) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com>

) Bumps [undici](https://github.com/nodejs/undici) from 5.28.3 to 5.28.4. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.3...v5.28.4) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

Bumps [crytic/slither-action](https://github.com/crytic/slither-action) from 0.3.1 to 0.3.2. - [Release notes](https://github.com/crytic/slither-action/releases) - [Commits](crytic/slither-action@v0.3.1...v0.3.2) --- updated-dependencies: - dependency-name: crytic/slither-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

* build(deps): bump golang.org/x/net from 0.22.0 to 0.23.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](golang/net@v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * gomod2nix generate --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: Ramiro Carlucho <ramirocarlucho@gmail.com>

) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.30.0 to 1.30.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.30.0...v1.30.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

* build(deps): bump golang.org/x/crypto from 0.21.0 to 0.22.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.21.0 to 0.22.0. - [Commits](golang/crypto@v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * update gomod2nix.toml file --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: GAtom22 <GAtom22@users.noreply.github.com>

Signed-off-by: redistay <wujunjing@outlook.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

* add protolint to make proto-lint command * add changelog entry --------- Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>

* update SECURITY.md file * add changelog entry * fix typos * markdown lint * lint * lint * Update CHANGELOG.md Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> --------- Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

…4.0`. (#2475) * Merge pull request from GHSA-3fp5-2xwh-fxm6 * imp(evm): Improve statedb commit efficiency * gomod2nix generate --------- Co-authored-by: tom <tomasguerraalda@hotmail.com> * update changelog (#2470) * update changelog * Update CHANGELOG.md * gomod2nix generate * go mod tidy * go mod tidy * udpate changelog * add integration tests * run make format * address linters --------- Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com> Co-authored-by: MalteHerrmann <malte@evmos.org> Co-authored-by: MalteHerrmann <MalteHerrmann@users.noreply.github.com>

) * build(deps): bump github.com/cosmos/ibc-go/v7 from 7.3.2 to 7.4.0 Bumps [github.com/cosmos/ibc-go/v7](https://github.com/cosmos/ibc-go) from 7.3.2 to 7.4.0. - [Release notes](https://github.com/cosmos/ibc-go/releases) - [Changelog](https://github.com/cosmos/ibc-go/blob/v7.4.0/CHANGELOG.md) - [Commits](cosmos/ibc-go@v7.3.2...v7.4.0) --- updated-dependencies: - dependency-name: github.com/cosmos/ibc-go/v7 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * update gomod2nix.toml file --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: GAtom22 <GAtom22@users.noreply.github.com> Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>

* build(deps): bump golang.org/x/net from 0.23.0 to 0.24.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.23.0 to 0.24.0. - [Commits](golang/net@v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * gomod2nix generate --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

imp(evm): using maps.Clone API to simplify code Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

* build(deps): bump google.golang.org/grpc from 1.62.1 to 1.63.0 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.62.1 to 1.63.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.62.1...v1.63.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * gomod2nix generate * fix lint warnings --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>

* change Evmos SDK into evmOS * update changelog

* re add evm hooks * add changelog --------- Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

* re-add deleted erc20 evm hooks * changelog

* re-introduce convert coin txn * changelog

* refactor: Repeated parsing of packetData * add changelog entry --------- Co-authored-by: MalteHerrmann <malte@evmos.org>

) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.30.1 to 1.31.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.30.1...v1.31.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com>

* build(deps): bump github/super-linter from 5 to 6 Bumps [github/super-linter](https://github.com/github/super-linter) from 5 to 6. - [Release notes](https://github.com/github/super-linter/releases) - [Changelog](https://github.com/github/super-linter/blob/main/CHANGELOG.md) - [Commits](github/super-linter@v5...v6) --- updated-dependencies: - dependency-name: github/super-linter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues * address some lint issues --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

…2512) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4.0.0 to 5.0.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4.0.0...v5.0.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

* build(deps): bump github.com/rs/cors from 1.10.1 to 1.11.0 Bumps [github.com/rs/cors](https://github.com/rs/cors) from 1.10.1 to 1.11.0. - [Commits](rs/cors@v1.10.1...v1.11.0) --- updated-dependencies: - dependency-name: github.com/rs/cors dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * add write permissions in e2e-test action * add write permissions in e2e-test action * gomod2nix generate --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com>

…tion (#2507) * add lockedUpVested delegations in LockedCoins calculation * add changelog entry * Update x/vesting/keeper/integration_test.go Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com> Signed-off-by: Tom <54514587+GAtom22@users.noreply.github.com> * run make format --------- Signed-off-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com> Co-authored-by: GAtom22 <GAtom22@users.noreply.github.com>

0xstepit

Great job @facs95

MalteHerrmann and others added 30 commits March 21, 2024 14:40

imp(ante): Minor improvements to readibility (#2427)

687c1f9

* improve readibility and add safety measure * remove unnecessary util * add changelog entry

chore(deps): update ca-certificates docker dep (#2424)

2ba4587

chore(deps): update docker dep

build(deps): bump github.com/docker/docker from 24.0.7+incompatible t…

c2bdd9a

…o 24.0.9+incompatible (#2426)

chore: fix typos (#2431)

724a3c3

Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

chore: remove repetitive words in proto file (#2439)

0068512

Signed-off-by: JohnEndson <jiayuzhen@outlook.com>

chore: update legal email (#2449)

cb7974f

change legal mail

only use os mail address for inquiries (#2457)

c124b8b

* only use os mail address for inquiries * add missing dot

refactor(evm): using maps in std library (#2438)

e7fb8ed

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

chore: remove the repetitive not (#2446)

0d00b39

Signed-off-by: redistay <wujunjing@outlook.com> Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

imp(make): Add protolint to make proto-lint command (#2444)

a69fba9

* add protolint to make proto-lint command * add changelog entry --------- Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>

chore(deps): update docker dep (#2474)

2b4da3f

imp(evm): using maps.Clone api to simplify code (#2436)

182f457

imp(evm): using maps.Clone API to simplify code Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

change Evmos SDK into evmOS (#2478)

78243df

* change Evmos SDK into evmOS * update changelog

ramacarlucho and others added 13 commits April 23, 2024 10:36

imp(evm): Add evm hook logic again (#2501)

d0ddd88

* re add evm hooks * add changelog --------- Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>

chore(erc20): re-add deleted erc20 evm hooks (#2502)

994f54d

* re-add deleted erc20 evm hooks * changelog

chore(cli): re-introduce convert coin txn for erc20 module (#2503)

b46ed25

* re-introduce convert coin txn * changelog

refactor: Repeated parsing of packetData (#2504)

80be866

* refactor: Repeated parsing of packetData * add changelog entry --------- Co-authored-by: MalteHerrmann <malte@evmos.org>

chore: remove outdated localnet setup (#2509)

45e4ecd

refactor: Delete unused keeper interface (#2510)

8dd3b32

perf: Move the check moduleAddress before reading the db (#2511)

29a44c7

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

Merge branch 'main' into facs95/str-merge-main

8a35ec5

facs95 requested a review from a team as a code owner April 28, 2024 22:06

facs95 requested review from Vvaradinov and GAtom22 April 28, 2024 22:06

github-actions bot added proto build CI CLI types tests precompile contracts labels Apr 28, 2024

run make format

f9bec5f

facs95 changed the title ~~Facs95/str merge main~~ chore(strv2): Merge main back into feature branch Apr 28, 2024

ramacarlucho approved these changes Apr 29, 2024

View reviewed changes

0xstepit approved these changes Apr 30, 2024

View reviewed changes

facs95 merged commit 3722159 into feat/str-v2 Apr 30, 2024
22 of 24 checks passed

facs95 deleted the facs95/str-merge-main branch April 30, 2024 14:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(strv2): Merge main back into feature branch #2518

chore(strv2): Merge main back into feature branch #2518

facs95 commented Apr 28, 2024 •

edited

0xstepit left a comment

chore(strv2): Merge main back into feature branch #2518

chore(strv2): Merge main back into feature branch #2518

Conversation

facs95 commented Apr 28, 2024 • edited

Description

Author Checklist

Reviewers Checklist

0xstepit left a comment

Choose a reason for hiding this comment

facs95 commented Apr 28, 2024 •

edited