Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de

WORKDIR /code

# Copy dkls23-rs and garbling first (needed for go.mod replace directive)
# Copy local replace-directive targets first (needed to read their go.mod during `go mod download`)
COPY dkls23-rs ./dkls23-rs
COPY garbling ./garbling
COPY compat/orm-api ./compat/orm-api

# Download go modules + wasmvm static library
ADD go.mod go.sum ./
Expand Down
13 changes: 13 additions & 0 deletions app/ante/fee_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ante_test
import (
"context"
"testing"
"time"

cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -97,6 +98,18 @@ func (m *mockAccountKeeperAnte) AddressCodec() addresscodec.Codec {
return sdkaddress.NewBech32Codec("push")
}

func (m *mockAccountKeeperAnte) UnorderedTransactionsEnabled() bool {
return false
}

func (m *mockAccountKeeperAnte) RemoveExpiredUnorderedNonces(_ sdk.Context) error {
return nil
}

func (m *mockAccountKeeperAnte) TryAddUnorderedNonce(_ sdk.Context, _ []byte, _ time.Time) error {
return nil
}

// mockBankKeeperAnte records whether the deduct call was made.
type mockBankKeeperAnte struct {
deductCalled bool
Expand Down
8 changes: 5 additions & 3 deletions app/ante/handler_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ante

import (
"context"
"time"

addresscodec "cosmossdk.io/core/address"
corestoretypes "cosmossdk.io/core/store"
Expand Down Expand Up @@ -38,9 +39,10 @@ type AccountKeeper interface {
GetParams(ctx context.Context) (params authtypes.Params)
GetSequence(ctx context.Context, addr sdk.AccAddress) (uint64, error)
AddressCodec() addresscodec.Codec
// RemoveExpiredUnorderedNonces(ctx sdk.Context) error
// TryAddUnorderedNonce(sdk.Context, []byte, time.Time) error
// UnorderedTransactionsEnabled() bool
// Unordered transaction support (added in cosmos-sdk v0.53).
UnorderedTransactionsEnabled() bool
RemoveExpiredUnorderedNonces(ctx sdk.Context) error
TryAddUnorderedNonce(ctx sdk.Context, sender []byte, timestamp time.Time) error
}

// HandlerOptions defines the list of module keepers required to run the EVM
Expand Down
16 changes: 16 additions & 0 deletions compat/orm-api/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Compatibility shim: cosmossdk.io/api dropped the cosmos/orm/* API packages
// in api v0.9.0, but cosmossdk.io/orm (and the ORM-backed x/uregistry and
// x/uvalidator modules) still depend on them. cosmos-sdk v0.53.x requires
// api v0.9.2, so we re-provide the (unchanged) generated orm API packages here
// as a nested module and wire it in via a replace directive in the root go.mod.
// Sources copied verbatim from cosmossdk.io/api v0.8.2 (the last release that
// shipped these packages).
module cosmossdk.io/api/cosmos/orm

go 1.23

require (
cosmossdk.io/api v0.9.2
github.com/cosmos/cosmos-proto v1.0.0-beta.5
google.golang.org/protobuf v1.36.10
)
Loading
Loading