Skip to content

Enable EVM Fusaka hard-fork #913

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

Merged
merged 8 commits into from
Nov 7, 2025
Merged

Enable EVM Fusaka hard-fork #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1764f0
Enable EVM Fusaka hard-fork for PreviewNet & Testnet
m-Peter Oct 27, 2025
ca6ee61
Update gas estimation logic to account for the max gas limit introduc…
m-Peter Oct 29, 2025
79d0f45
Use provided height on eth_estimateGas instead of fetching latest
m-Peter Oct 31, 2025
e69c96b
Bump to latest go-ethereum and flow-go
m-Peter Nov 5, 2025
8964eb2
Remove obsolete tx gas limit check in favor of the Fusaka protocol tx…
m-Peter Nov 6, 2025
4e42603
Simplify creation of ChainConfig
m-Peter Nov 6, 2025
1b15c77
Bump flow-emulator version
m-Peter Nov 7, 2025
f9e2865
Fix failing tests due to scheduled transactions
m-Peter Nov 7, 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
9 changes: 5 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ go 1.25.0

require (
github.com/cockroachdb/pebble v1.1.5
github.com/ethereum/go-ethereum v1.16.5
github.com/ethereum/go-ethereum v1.16.7
github.com/goccy/go-json v0.10.4
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/holiman/uint256 v1.3.2
github.com/onflow/atree v0.11.0
github.com/onflow/cadence v1.8.3
github.com/onflow/flow-go v0.43.3-0.20251029192457-d4f875155987
github.com/onflow/flow-go v0.44.0-experimental-cadence-v1.8.3.0.20251105104202-ffe43bb485d9
github.com/onflow/flow-go-sdk v1.9.2
github.com/prometheus/client_golang v1.20.5
github.com/rs/cors v1.8.0
Expand All @@ -38,6 +38,7 @@ require (
cloud.google.com/go/longrunning v0.6.7 // indirect
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 // indirect
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VictoriaMetrics/fastcache v1.13.0 // indirect
Expand Down Expand Up @@ -71,7 +72,7 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/ef-ds/deque v1.0.4 // indirect
github.com/emicklei/dot v1.6.2 // indirect
github.com/ethereum/c-kzg-4844/v2 v2.1.3 // indirect
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect
github.com/ethereum/go-verkle v0.2.2 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand Down Expand Up @@ -153,7 +154,7 @@ require (
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 // indirect
github.com/onflow/flow-nft/lib/go/templates v1.3.0 // indirect
github.com/onflow/flow/protobuf/go/flow v0.4.16 // indirect
github.com/onflow/flow/protobuf/go/flow v0.4.18 // indirect
github.com/onflow/go-ethereum v1.13.4 // indirect
github.com/onflow/sdks v0.6.0-preview.1 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
Expand Down
18 changes: 10 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 h1:1zYrtlhrZ6/b6SAjLSfKzWtdgqK0U+HtH/VcBWh1BaU=
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6/go.mod h1:ioLG6R+5bUSO1oeGSDxOV3FADARuMoytZCSX6MEMQkI=
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc h1:DCHzPQOcU/7gwDTWbFQZc5qHMPS1g0xTO56k8NXsv9M=
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc/go.mod h1:LJM5a3zcIJ/8TmZwlUczvROEJT8ntOdhdG9jjcR1B0I=
github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
Expand Down Expand Up @@ -191,12 +193,12 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum/c-kzg-4844/v2 v2.1.3 h1:DQ21UU0VSsuGy8+pcMJHDS0CV1bKmJmxsJYK8l3MiLU=
github.com/ethereum/c-kzg-4844/v2 v2.1.3/go.mod h1:fyNcYI/yAuLWJxf4uzVtS8VDKeoAaRM8G/+ADz/pRdA=
github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s=
github.com/ethereum/c-kzg-4844/v2 v2.1.5/go.mod h1:u59hRTTah4Co6i9fDWtiCjTrblJv0UwsqZKCc0GfgUs=
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJhy07IMfEKuARQ9TKojGqLVNxQajaXEp/BoqSk=
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8=
github.com/ethereum/go-ethereum v1.16.5 h1:GZI995PZkzP7ySCxEFaOPzS8+bd8NldE//1qvQDQpe0=
github.com/ethereum/go-ethereum v1.16.5/go.mod h1:kId9vOtlYg3PZk9VwKbGlQmSACB5ESPTBGT+M9zjmok=
github.com/ethereum/go-ethereum v1.16.7 h1:qeM4TvbrWK0UC0tgkZ7NiRsmBGwsjqc64BHo20U59UQ=
github.com/ethereum/go-ethereum v1.16.7/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
Expand Down Expand Up @@ -569,16 +571,16 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
github.com/onflow/flow-go v0.43.3-0.20251029192457-d4f875155987 h1:Y5sXTNDBZ6PxRrQh1SKaNyGPYBAasJqs0JqjYWleAd0=
github.com/onflow/flow-go v0.43.3-0.20251029192457-d4f875155987/go.mod h1:B+FLhOh5fC3AlZsRro5LsxqVwlWxgM8uNYIIGjapvIw=
github.com/onflow/flow-go v0.44.0-experimental-cadence-v1.8.3.0.20251105104202-ffe43bb485d9 h1:HqJTv25GG91wcEH53YYed75aGnGkSz8/Nd5xom+frsA=
github.com/onflow/flow-go v0.44.0-experimental-cadence-v1.8.3.0.20251105104202-ffe43bb485d9/go.mod h1:GGu6QswYW9YaSKBBRCnb1fhVZ4yIrHe4qMaTqVLqjLs=
github.com/onflow/flow-go-sdk v1.9.2 h1:kMw3qShgLNIASHGMgoY+faTBQ+1MnzsNLAH+oxy9eiY=
github.com/onflow/flow-go-sdk v1.9.2/go.mod h1:qVuzMGXNJBMktKnIDKLjV0/k21P2XD39dOfMW+X5Bsc=
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=
github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II=
github.com/onflow/flow-nft/lib/go/templates v1.3.0/go.mod h1:gVbb5fElaOwKhV5UEUjM+JQTjlsguHg2jwRupfM/nng=
github.com/onflow/flow/protobuf/go/flow v0.4.16 h1:UADQeq/mpuqFk+EkwqDNoF70743raWQKmB/Dm/eKt2Q=
github.com/onflow/flow/protobuf/go/flow v0.4.16/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/flow/protobuf/go/flow v0.4.18 h1:KOujA6lg9kTXCV6oK0eErD1rwRnM9taKZss3Szi+T3Q=
github.com/onflow/flow/protobuf/go/flow v0.4.18/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc=
Expand Down
7 changes: 0 additions & 7 deletions models/errors/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ func NewTxGasPriceTooLowError(gasPrice *big.Int) error {
))
}

func NewTxGasLimitTooHighError(maxGasLimit uint64) error {
return NewInvalidTransactionError(fmt.Errorf(
"tx gas limit exceeds the max value of %d: ",
maxGasLimit,
))
}

func NewRecoverableError(err error) error {
return fmt.Errorf("%w: %w", ErrRecoverable, err)
}
Expand Down
14 changes: 14 additions & 0 deletions models/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,20 @@ func TestValidateTransaction(t *testing.T) {
valid: false,
errMsg: "transaction will create a contract with value but empty code",
},
"tx limit above gas limit cap": {
tx: gethTypes.NewTx(
&gethTypes.LegacyTx{
Nonce: 1,
To: &validToAddress,
Value: big.NewInt(0),
Gas: params.MaxTxGas + 100,
GasPrice: big.NewInt(0),
Data: []byte{},
},
),
valid: false,
errMsg: "transaction gas limit too high (cap: 16777216, tx: 16777316)",
},
}

head := &gethTypes.Header{
Expand Down
27 changes: 22 additions & 5 deletions services/requester/requester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ var (

const minFlowBalance = 2
const blockGasLimit = 120_000_000
const txMaxGasLimit = 50_000_000

// estimateGasErrorRatio is the amount of overestimation eth_estimateGas
// is allowed to produce in order to speed up calculations.
Expand Down Expand Up @@ -167,10 +166,6 @@ func (e *EVM) SendRawTransaction(ctx context.Context, data []byte) (common.Hash,
return common.Hash{}, err
}

if tx.Gas() > txMaxGasLimit {
return common.Hash{}, errs.NewTxGasLimitTooHighError(txMaxGasLimit)
}

head := &types.Header{
// `Number` is only useful to detect hard-forks which were
// activated with block numbers. However, Ethereum now
Expand Down Expand Up @@ -345,6 +340,28 @@ func (e *EVM) EstimateGas(
passingGasLimit = uint64(*txArgs.Gas)
}

if passingGasLimit > gethParams.MaxTxGas {
// Cap the maximum gas allowance according to EIP-7825 if the estimation targets Osaka
targetBlock, err := e.blocks.GetByHeight(height)
if err != nil {
return 0, err
}
blockNumber, blockTime := new(big.Int).SetUint64(targetBlock.Height), targetBlock.Timestamp

if blockOverrides != nil {
if blockOverrides.Number != nil {
blockNumber = blockOverrides.Number.ToInt()
}
if blockOverrides.Time != nil {
blockTime = uint64(*blockOverrides.Time)
Comment on lines +353 to +356
Copy link
Member

@zhangchiqing zhangchiqing Nov 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

if blockNumber and blockTime are updated here, do we need to update the configs at Line 352 and 353?

			emulator.WithBlockNumber(blockNumber),
			emulator.WithBlockTime(blockTime),

Copy link
Collaborator Author

@m-Peter m-Peter Nov 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Nice catch @zhangchiqing 👏

This part was a bit confusing, so I simplified the creation of the ChainConfig in ee75cc9 .

For reference, the config for the activation of each hard-fork, is actually hard-coded here: https://github.com/onflow/flow-go/blob/master/fvm/evm/emulator/config.go#L86-L123 . And this isn't something that depends on the block overrides that a user supplies for gas estimation.

The configs at Line 352 and 353:

emulator.WithBlockNumber(blockNumber),
emulator.WithBlockTime(blockTime),

only control the returned values of:

block.number;
block.timestamp;

in a Solidity contract function execution. And this part is already handled else-where: https://github.com/onflow/flow-evm-gateway/blob/main/services/requester/overridable_blocks_provider.go#L49-L55 .

}
}
chainConfig := emulator.MakeChainConfig(e.config.EVMNetworkID)
if chainConfig.IsOsaka(blockNumber, blockTime) {
passingGasLimit = gethParams.MaxTxGas
}
}

// We first execute the transaction at the highest allowable gas limit,
// since if this fails we can return the error immediately.
result, err := dryRun(passingGasLimit)
Expand Down
11 changes: 6 additions & 5 deletions tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/onflow/flow-evm-gateway/integration
go 1.25.0

require (
github.com/ethereum/go-ethereum v1.16.5
github.com/ethereum/go-ethereum v1.16.7
github.com/goccy/go-json v0.10.4
github.com/onflow/cadence v1.8.3
github.com/onflow/crypto v0.25.3
github.com/onflow/flow-emulator v1.10.4
github.com/onflow/flow-emulator v1.11.1-0.20251107105328-ff6728fc0f1a
github.com/onflow/flow-evm-gateway v0.0.0-20240201154855-4d4d3d3f19c7
github.com/onflow/flow-go v0.43.3-0.20251029192457-d4f875155987
github.com/onflow/flow-go v0.44.0-experimental-cadence-v1.8.3.0.20251105104202-ffe43bb485d9
github.com/onflow/flow-go-sdk v1.9.2
github.com/rs/zerolog v1.34.0
github.com/stretchr/testify v1.11.1
Expand All @@ -26,6 +26,7 @@ require (
cloud.google.com/go/longrunning v0.6.7 // indirect
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 // indirect
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VictoriaMetrics/fastcache v1.13.0 // indirect
Expand Down Expand Up @@ -66,7 +67,7 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/ef-ds/deque v1.0.4 // indirect
github.com/emicklei/dot v1.6.2 // indirect
github.com/ethereum/c-kzg-4844/v2 v2.1.3 // indirect
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect
github.com/ethereum/go-verkle v0.2.2 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand Down Expand Up @@ -164,7 +165,7 @@ require (
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 // indirect
github.com/onflow/flow-nft/lib/go/templates v1.3.0 // indirect
github.com/onflow/flow/protobuf/go/flow v0.4.16 // indirect
github.com/onflow/flow/protobuf/go/flow v0.4.18 // indirect
github.com/onflow/go-ethereum v1.13.4 // indirect
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 // indirect
github.com/onflow/sdks v0.6.0-preview.1 // indirect
Expand Down
22 changes: 12 additions & 10 deletions tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 h1:1zYrtlhrZ6/b6SAjLSfKzWtdgqK0U+HtH/VcBWh1BaU=
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6/go.mod h1:ioLG6R+5bUSO1oeGSDxOV3FADARuMoytZCSX6MEMQkI=
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc h1:DCHzPQOcU/7gwDTWbFQZc5qHMPS1g0xTO56k8NXsv9M=
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc/go.mod h1:LJM5a3zcIJ/8TmZwlUczvROEJT8ntOdhdG9jjcR1B0I=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
Expand Down Expand Up @@ -292,12 +294,12 @@ github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
github.com/ethereum/c-kzg-4844/v2 v2.1.3 h1:DQ21UU0VSsuGy8+pcMJHDS0CV1bKmJmxsJYK8l3MiLU=
github.com/ethereum/c-kzg-4844/v2 v2.1.3/go.mod h1:fyNcYI/yAuLWJxf4uzVtS8VDKeoAaRM8G/+ADz/pRdA=
github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s=
github.com/ethereum/c-kzg-4844/v2 v2.1.5/go.mod h1:u59hRTTah4Co6i9fDWtiCjTrblJv0UwsqZKCc0GfgUs=
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJhy07IMfEKuARQ9TKojGqLVNxQajaXEp/BoqSk=
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8=
github.com/ethereum/go-ethereum v1.16.5 h1:GZI995PZkzP7ySCxEFaOPzS8+bd8NldE//1qvQDQpe0=
github.com/ethereum/go-ethereum v1.16.5/go.mod h1:kId9vOtlYg3PZk9VwKbGlQmSACB5ESPTBGT+M9zjmok=
github.com/ethereum/go-ethereum v1.16.7 h1:qeM4TvbrWK0UC0tgkZ7NiRsmBGwsjqc64BHo20U59UQ=
github.com/ethereum/go-ethereum v1.16.7/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
Expand Down Expand Up @@ -812,24 +814,24 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.1 h1:u6am8NzuWOIKkSk
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.1/go.mod h1:jBDqVep0ICzhXky56YlyO4aiV2Jl/5r7wnqUPpvi7zE=
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.1 h1:ebyynXy74ZcfW+JpPwI+aaY0ezlxxA0cUgUrjhJonWg=
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.1/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
github.com/onflow/flow-emulator v1.10.4 h1:8k8RjZfXJRAkhjprw9M99/PsFaElw2mz+Ea66Fra4FY=
github.com/onflow/flow-emulator v1.10.4/go.mod h1:h45K6PxWMGMpT1L8q4BmQOwkQvgXpDPL/QqiJ8bgu5I=
github.com/onflow/flow-emulator v1.11.1-0.20251107105328-ff6728fc0f1a h1:s3l5EtVBSE5ili7bDjQaWQTjhH8rTyB5AMtyphnIQfY=
github.com/onflow/flow-emulator v1.11.1-0.20251107105328-ff6728fc0f1a/go.mod h1:dvOO+rC8aMq6U4c9JJP8Mow+AZBP8NveFw8j8n9xe4s=
github.com/onflow/flow-evm-bridge v0.1.0 h1:7X2osvo4NnQgHj8aERUmbYtv9FateX8liotoLnPL9nM=
github.com/onflow/flow-evm-bridge v0.1.0/go.mod h1:5UYwsnu6WcBNrwitGFxphCl5yq7fbWYGYuiCSTVF6pk=
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3SsEftzXG2JlmSe24=
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
github.com/onflow/flow-go v0.43.3-0.20251029192457-d4f875155987 h1:Y5sXTNDBZ6PxRrQh1SKaNyGPYBAasJqs0JqjYWleAd0=
github.com/onflow/flow-go v0.43.3-0.20251029192457-d4f875155987/go.mod h1:B+FLhOh5fC3AlZsRro5LsxqVwlWxgM8uNYIIGjapvIw=
github.com/onflow/flow-go v0.44.0-experimental-cadence-v1.8.3.0.20251105104202-ffe43bb485d9 h1:HqJTv25GG91wcEH53YYed75aGnGkSz8/Nd5xom+frsA=
github.com/onflow/flow-go v0.44.0-experimental-cadence-v1.8.3.0.20251105104202-ffe43bb485d9/go.mod h1:GGu6QswYW9YaSKBBRCnb1fhVZ4yIrHe4qMaTqVLqjLs=
github.com/onflow/flow-go-sdk v1.9.2 h1:kMw3qShgLNIASHGMgoY+faTBQ+1MnzsNLAH+oxy9eiY=
github.com/onflow/flow-go-sdk v1.9.2/go.mod h1:qVuzMGXNJBMktKnIDKLjV0/k21P2XD39dOfMW+X5Bsc=
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=
github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II=
github.com/onflow/flow-nft/lib/go/templates v1.3.0/go.mod h1:gVbb5fElaOwKhV5UEUjM+JQTjlsguHg2jwRupfM/nng=
github.com/onflow/flow/protobuf/go/flow v0.4.16 h1:UADQeq/mpuqFk+EkwqDNoF70743raWQKmB/Dm/eKt2Q=
github.com/onflow/flow/protobuf/go/flow v0.4.16/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/flow/protobuf/go/flow v0.4.18 h1:KOujA6lg9kTXCV6oK0eErD1rwRnM9taKZss3Szi+T3Q=
github.com/onflow/flow/protobuf/go/flow v0.4.18/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc=
Expand Down
12 changes: 6 additions & 6 deletions tests/tx_batching_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func Test_MultipleTransactionSubmissionsWithinSmallInterval(t *testing.T) {

txResults, err := emu.GetTransactionsByBlockID(block1.ID())
require.NoError(t, err)
require.Len(t, txResults, 1)
require.True(t, len(txResults) >= 1)

// Assert that the 1st transaction was submitted individually.
// The easiest way to check that is by making sure that the
Expand All @@ -273,7 +273,7 @@ func Test_MultipleTransactionSubmissionsWithinSmallInterval(t *testing.T) {

txResults, err = emu.GetTransactionsByBlockID(block2.ID())
require.NoError(t, err)
require.Len(t, txResults, 1)
require.True(t, len(txResults) >= 1)

// Assert that the 2nd transaction was submitted in a batch.
// The easiest way to check that is by making sure that the
Expand Down Expand Up @@ -371,7 +371,7 @@ func Test_MultipleTransactionSubmissionsWithinRecentInterval(t *testing.T) {

txResults, err := emu.GetTransactionsByBlockID(block1.ID())
require.NoError(t, err)
require.Len(t, txResults, 1)
require.True(t, len(txResults) >= 1)

// Assert that the 1st transaction was submitted individually.
// The easiest way to check that is by making sure that the
Expand All @@ -387,7 +387,7 @@ func Test_MultipleTransactionSubmissionsWithinRecentInterval(t *testing.T) {

txResults, err = emu.GetTransactionsByBlockID(block2.ID())
require.NoError(t, err)
require.Len(t, txResults, 1)
require.True(t, len(txResults) >= 1)

// Assert that the 2nd transaction was submitted in a batch.
// The easiest way to check that is by making sure that the
Expand Down Expand Up @@ -486,7 +486,7 @@ func Test_MultipleTransactionSubmissionsWithinNonRecentInterval(t *testing.T) {

txResults, err := emu.GetTransactionsByBlockID(block1.ID())
require.NoError(t, err)
require.Len(t, txResults, 1)
require.True(t, len(txResults) >= 1)

// Assert that the 1st transaction was submitted individually.
// The easiest way to check that is by making sure that the
Expand All @@ -502,7 +502,7 @@ func Test_MultipleTransactionSubmissionsWithinNonRecentInterval(t *testing.T) {

txResults, err = emu.GetTransactionsByBlockID(block2.ID())
require.NoError(t, err)
require.Len(t, txResults, 1)
require.True(t, len(txResults) >= 1)

// Assert that the 2nd transaction was also submitted individually.
// The easiest way to check that is by making sure that the
Expand Down
Loading