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

feat: cosmos v50 upgrade #179

Open
wants to merge 61 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
99eeed5
Problem: sdk 0.50 is not used
yihuang Mar 20, 2024
4f2e139
fix imports
skosito Jan 5, 2025
5f4e528
go mod fixes
skosito Jan 5, 2025
a6a6400
revert statedb changes
skosito Jan 7, 2025
21c3df7
proto fixes
skosito Jan 8, 2025
ac1b2bb
clesnup migrations
skosito Jan 8, 2025
8436859
fixes
skosito Jan 9, 2025
42c9a4f
tmp comment code
skosito Jan 9, 2025
3503229
remove custom get signers
skosito Jan 15, 2025
7c6fc26
add signer annotation to msgethereumtx
skosito Jan 15, 2025
1bc409a
logs
skosito Jan 15, 2025
c84252a
remove validation
skosito Jan 15, 2025
e3b712d
add from field to msg
skosito Jan 15, 2025
8d8a426
dont set empty msg.from field
skosito Jan 15, 2025
43c2547
remove from validation
skosito Jan 15, 2025
5afebcf
logs
skosito Jan 16, 2025
b2860bd
fix custom get signers
skosito Jan 16, 2025
9569c26
cleanup
skosito Jan 20, 2025
6c802e1
lint fixes
skosito Jan 20, 2025
de9762d
lint
skosito Jan 20, 2025
26f73f5
py tests
skosito Jan 20, 2025
d19e9b3
py lints
skosito Jan 20, 2025
b37dfe8
cleanup
skosito Jan 20, 2025
673ea0a
fix build in tests
skosito Jan 20, 2025
ae95135
update gomod2nix
gartnera Jan 22, 2025
52912ff
go 1.22
gartnera Jan 22, 2025
fe4c19f
fixing unit tests
skosito Jan 22, 2025
2a924d2
fmt
skosito Jan 22, 2025
1c9b0d3
fixing unit tests
skosito Jan 23, 2025
78a6054
gosec
skosito Jan 23, 2025
bb8627a
lint
skosito Jan 23, 2025
d3af991
try to bump nix files
skosito Jan 23, 2025
04bff26
add poetry2nix
skosito Jan 23, 2025
529826c
fix scripts env path
skosito Jan 23, 2025
85c7d29
add nix path to workflows
skosito Jan 23, 2025
30ea6e4
add poetry to build inputs
skosito Jan 23, 2025
be32c96
try to bump poetry lock
skosito Jan 23, 2025
59f7f58
increase sleep for test rpc
skosito Jan 23, 2025
12f1567
fix gen doc provider on start
skosito Jan 23, 2025
6a3811b
add 60 min timeout for integration tests
skosito Jan 23, 2025
5e95922
int tests fixes
skosito Jan 23, 2025
01616b7
bump upload artifact to v4
skosito Jan 23, 2025
f3ad28b
add autocli
skosito Jan 23, 2025
5ea92e7
more fixes
skosito Jan 23, 2025
1494435
revert
skosito Jan 23, 2025
521f9d5
revert
skosito Jan 24, 2025
7abcfc2
typo
skosito Jan 24, 2025
f2105f7
revert go eth nix
skosito Jan 24, 2025
e0cc7d0
log
skosito Jan 24, 2025
d023627
fix state db add log
skosito Jan 24, 2025
e7be8e3
fixing remaining int tests
skosito Jan 24, 2025
011b25a
uncomment upgrade integration test
skosito Jan 24, 2025
0d9a712
use vendorHash
skosito Jan 24, 2025
3094aa3
fix go ver
skosito Jan 24, 2025
eb9564b
fix vendor hash
skosito Jan 24, 2025
d4fc2ec
test upgrade fix
skosito Jan 24, 2025
12d1012
add missing cmd
skosito Jan 24, 2025
644e83a
comment back test upgrade
skosito Jan 24, 2025
9527906
py lints
skosito Jan 24, 2025
aef63e6
py lint
skosito Jan 24, 2025
b12523a
gosec
skosito Jan 24, 2025
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
8 changes: 6 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
- uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixos-22.11
- uses: cachix/cachix-action@v15
with:
name: ethermint
Expand All @@ -73,7 +75,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
- uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixos-22.11
- uses: cachix/cachix-action@v15
with:
name: ethermint
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,12 @@ jobs:

integration_tests:
runs-on: ubuntu-latest
# timeout-minutes: 30
timeout-minutes: 60
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
- uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixos-22.11
- uses: cachix/cachix-action@v15
with:
name: ethermint
Expand All @@ -108,7 +110,7 @@ jobs:
- name: 'Tar debug files'
if: failure()
run: tar cfz debug_files.tar.gz -C /tmp/pytest-of-runner .
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: debug-files
Expand All @@ -124,7 +126,9 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
- uses: cachix/install-nix-action@v23
with:
nix_path: nixpkgs=channel:nixos-22.11
- uses: cachix/cachix-action@v15
with:
name: ethermint
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ test-import:
go test -run TestImporterTestSuite -v --vet=off github.com/zeta-chain/ethermint/tests/importer

test-rpc:
./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 2 -m "rpc" -r "true"
./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 5 -m "rpc" -r "true"

run-integration-tests:
@nix-shell ./tests/integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
Expand Down Expand Up @@ -393,7 +393,7 @@ format-fix:
###############################################################################


protoVer=0.11.6
protoVer=0.14.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

Expand Down
7 changes: 4 additions & 3 deletions app/ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import (
"fmt"
"runtime/debug"

tmlog "github.com/cometbft/cometbft/libs/log"
tmlog "cosmossdk.io/log"

errorsmod "cosmossdk.io/errors"
storetypes "cosmossdk.io/store/types"
"github.com/cosmos/cosmos-sdk/crypto/types/multisig"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
Expand Down Expand Up @@ -114,7 +115,7 @@ var _ authante.SignatureVerificationGasConsumer = DefaultSigVerificationGasConsu
// for signature verification based upon the public key type. The cost is fetched from the given params and is matched
// by the concrete type.
func DefaultSigVerificationGasConsumer(
meter sdk.GasMeter, sig signing.SignatureV2, params authtypes.Params,
meter storetypes.GasMeter, sig signing.SignatureV2, params authtypes.Params,
) error {
pubkey := sig.PubKey
switch pubkey := pubkey.(type) {
Expand All @@ -137,7 +138,7 @@ func DefaultSigVerificationGasConsumer(

// ConsumeMultisignatureVerificationGas consumes gas from a GasMeter for verifying a multisig pubkey signature
func ConsumeMultisignatureVerificationGas(
meter sdk.GasMeter, sig *signing.MultiSignatureData, pubkey multisig.PubKey,
meter storetypes.GasMeter, sig *signing.MultiSignatureData, pubkey multisig.PubKey,
params authtypes.Params, accSeq uint64,
) error {
size := sig.BitArray.Count()
Expand Down
Loading
Loading