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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1
github.com/onflow/atree v0.9.0
github.com/onflow/cadence v1.3.3
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250331091535-024f2e1a80d8
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250402073838-34a46fce721e
github.com/onflow/flow-go-sdk v1.3.3
github.com/onflow/go-ethereum v1.14.8-0.20250327101549-e6d0051ec37a
github.com/prometheus/client_golang v1.20.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -562,8 +562,8 @@ 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.39.3-unsafe-cdp.0.0.20250331091535-024f2e1a80d8 h1:MbjNpZ9/gJDTms/0UJkP7DLBzzsc53kaXcHyotbygqI=
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250331091535-024f2e1a80d8/go.mod h1:DqUwra2t1ZUIO4ZfYRYyyAJM/0YzP6gobElabhm5CNY=
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250402073838-34a46fce721e h1:TcBrSBaNyVP0VHFAA4oArkB3oT1zCgwYzrKjaK1/mzs=
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250402073838-34a46fce721e/go.mod h1:DqUwra2t1ZUIO4ZfYRYyyAJM/0YzP6gobElabhm5CNY=
github.com/onflow/flow-go-sdk v1.3.3 h1:wj7llql3wesQYBePh3lEFI+jk3Df1sa13bRsL139JDo=
github.com/onflow/flow-go-sdk v1.3.3/go.mod h1:tSLvYIac9DlmUEqKHSHbVRyv4mSB0va4AuiV3XB9ENc=
github.com/onflow/flow-nft/lib/go/contracts v1.2.3 h1:4ju20g1xgDKWBT63rOj5f/Sa4Lc+naCSWT4p31x9yQk=
Expand Down
2 changes: 1 addition & 1 deletion models/transaction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ func TestValidateConsensusRules(t *testing.T) {
// All those fields are summed up to at most 213 bytes.
baseSize := uint64(213)
dataSize := TxMaxSize - baseSize
gasLimit := uint64(2_500_000)
gasLimit := uint64(5_500_000)
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Change comes from: EIP-7623: Increase calldata cost.
See: https://mixbytes.io/blog/the-prague-electra-pectra-hardfork-explained#rec860520137 .


// Try adding a transaction with maximal allowed size
tx := makeSignedTx(gasLimit, dataSize, key, signer)
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/onflow/crypto v0.25.2
github.com/onflow/flow-emulator v1.2.1-0.20250314161500-c55d0b34c1dc
github.com/onflow/flow-evm-gateway v0.0.0-20240201154855-4d4d3d3f19c7
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250331091535-024f2e1a80d8
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250402073838-34a46fce721e
github.com/onflow/flow-go-sdk v1.3.3
github.com/onflow/go-ethereum v1.14.8-0.20250327101549-e6d0051ec37a
github.com/rs/zerolog v1.33.0
Expand Down
4 changes: 2 additions & 2 deletions tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -799,8 +799,8 @@ 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.39.3-unsafe-cdp.0.0.20250331091535-024f2e1a80d8 h1:MbjNpZ9/gJDTms/0UJkP7DLBzzsc53kaXcHyotbygqI=
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250331091535-024f2e1a80d8/go.mod h1:DqUwra2t1ZUIO4ZfYRYyyAJM/0YzP6gobElabhm5CNY=
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250402073838-34a46fce721e h1:TcBrSBaNyVP0VHFAA4oArkB3oT1zCgwYzrKjaK1/mzs=
github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250402073838-34a46fce721e/go.mod h1:DqUwra2t1ZUIO4ZfYRYyyAJM/0YzP6gobElabhm5CNY=
github.com/onflow/flow-go-sdk v1.3.3 h1:wj7llql3wesQYBePh3lEFI+jk3Df1sa13bRsL139JDo=
github.com/onflow/flow-go-sdk v1.3.3/go.mod h1:tSLvYIac9DlmUEqKHSHbVRyv4mSB0va4AuiV3XB9ENc=
github.com/onflow/flow-nft/lib/go/contracts v1.2.3 h1:4ju20g1xgDKWBT63rOj5f/Sa4Lc+naCSWT4p31x9yQk=
Expand Down
2 changes: 1 addition & 1 deletion tests/web3js/build_evm_state_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ it('should handle a large number of EVM interactions', async () => {
gas: 55_000,
gasPrice: conf.minGasPrice
}, 82n)
assert.equal(estimatedGas, 21358n)
assert.equal(estimatedGas, 21646n)
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Change comes from: EIP-7623: Increase calldata cost.
See: https://mixbytes.io/blog/the-prague-electra-pectra-hardfork-explained#rec860520137 .


estimatedGas = await web3.eth.estimateGas({
from: conf.eoa.address,
Expand Down
8 changes: 4 additions & 4 deletions tests/web3js/debug_traces_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,15 +283,15 @@ it('should retrieve transaction traces', async () => {
txTrace,
{
from: conf.eoa.address.toLowerCase(),
gas: '0xb50d',
gas: '0xb56b',
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Change comes from: EIP-7623: Increase calldata cost.
See: https://mixbytes.io/blog/the-prague-electra-pectra-hardfork-explained#rec860520137 .

gasUsed: '0x6147',
to: contractAddress.toLowerCase(),
input: '0xc550f90f',
output: '0x0000000000000000000000000000000000000000000000000000000000000006',
calls: [
{
from: contractAddress.toLowerCase(),
gas: '0x54e1',
gas: '0x553d',
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Change comes from: EIP-7623: Increase calldata cost.
See: https://mixbytes.io/blog/the-prague-electra-pectra-hardfork-explained#rec860520137 .

gasUsed: '0x2',
to: '0x0000000000000000000000010000000000000001',
input: '0x53e87d66',
Expand Down Expand Up @@ -585,15 +585,15 @@ it('should retrieve call traces', async () => {
{
from: conf.eoa.address.toLowerCase(),
gas: '0xcdd4',
gasUsed: '0xb38f',
gasUsed: '0xb3ed',
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Change comes from: EIP-7623: Increase calldata cost.
See: https://mixbytes.io/blog/the-prague-electra-pectra-hardfork-explained#rec860520137 .

to: contractAddress.toLowerCase(),
input: '0xc550f90f',
output: '0x0000000000000000000000000000000000000000000000000000000000000007',
calls: [
{
from: contractAddress.toLowerCase(),
gas: '0x6d44',
gasUsed: '0x524a',
gasUsed: '0x52a8',
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Change comes from: EIP-7623: Increase calldata cost.
See: https://mixbytes.io/blog/the-prague-electra-pectra-hardfork-explained#rec860520137 .

to: '0x0000000000000000000000010000000000000001',
input: '0x53e87d66',
output: '0x0000000000000000000000000000000000000000000000000000000000000007',
Expand Down
2 changes: 1 addition & 1 deletion tests/web3js/eth_deploy_contract_and_interact_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ it('deploy contract and interact', async () => {
},
'0x1'
)
assert.equal(gasEstimate, 21510n)
assert.equal(gasEstimate, 22026n)
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Change comes from: EIP-7623: Increase calldata cost.
See: https://mixbytes.io/blog/the-prague-electra-pectra-hardfork-explained#rec860520137 .


gasEstimate = await web3.eth.estimateGas(
{
Expand Down