Skip to content

Commit 4501243

Browse files
m-Peterm-Peter
committed
Run E2E tests with EVM VM bridge enabled
1 parent 25b8222 commit 4501243

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/holiman/uint256 v1.3.2
1212
github.com/onflow/atree v0.10.1
1313
github.com/onflow/cadence v1.7.0
14-
github.com/onflow/flow-go v0.43.1-rc.4.0.20250930135247-97f6643af6f8
14+
github.com/onflow/flow-go v0.43.1-rc.4.0.20251003084044-7de2383796cb
1515
github.com/onflow/flow-go-sdk v1.8.2
1616
github.com/prometheus/client_golang v1.20.5
1717
github.com/rs/cors v1.8.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
568568
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
569569
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
570570
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
571-
github.com/onflow/flow-go v0.43.1-rc.4.0.20250930135247-97f6643af6f8 h1:WuuYhrXQfqYpOPXUsyq2fbPtx8uiXSMuxHOUJdqGVIY=
572-
github.com/onflow/flow-go v0.43.1-rc.4.0.20250930135247-97f6643af6f8/go.mod h1:Ra4VlmRlJsh73TIMDQ3mDS00Kuuy2UgIpvBtoTN+ETI=
571+
github.com/onflow/flow-go v0.43.1-rc.4.0.20251003084044-7de2383796cb h1:yLmYLRlyuSeAggJvLJijf5L0YEVEpBpHVsRhw6eRHfM=
572+
github.com/onflow/flow-go v0.43.1-rc.4.0.20251003084044-7de2383796cb/go.mod h1:Ra4VlmRlJsh73TIMDQ3mDS00Kuuy2UgIpvBtoTN+ETI=
573573
github.com/onflow/flow-go-sdk v1.8.2 h1:Jkoh0LdH4kIADFdHoHK31qHcH0QnCkAL+ybjAkBEbqc=
574574
github.com/onflow/flow-go-sdk v1.8.2/go.mod h1:/5g1t+xgk1nFXz8ifk8O3aT4DqLwq5p3k2BhiW4ZX+U=
575575
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=

‎tests/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ require (
77
github.com/goccy/go-json v0.10.4
88
github.com/onflow/cadence v1.7.0
99
github.com/onflow/crypto v0.25.3
10-
github.com/onflow/flow-emulator v1.7.2
10+
github.com/onflow/flow-emulator v1.7.5-0.20251003113055-b2aa4e72fe6c
1111
github.com/onflow/flow-evm-gateway v0.0.0-20240201154855-4d4d3d3f19c7
12-
github.com/onflow/flow-go v0.43.1-rc.4.0.20250930135247-97f6643af6f8
12+
github.com/onflow/flow-go v0.43.1-rc.4.0.20251003084044-7de2383796cb
1313
github.com/onflow/flow-go-sdk v1.8.2
1414
github.com/rs/zerolog v1.34.0
1515
github.com/stretchr/testify v1.11.1

‎tests/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -810,16 +810,16 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.0 h1:m6lHp0xDdmVWbpb
810810
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.0/go.mod h1:jBDqVep0ICzhXky56YlyO4aiV2Jl/5r7wnqUPpvi7zE=
811811
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.0 h1:8jn4Lxp/dpyWdgJ+5XEDUkYOf2aveObZtHtkdnYIEco=
812812
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.0/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
813-
github.com/onflow/flow-emulator v1.7.2 h1:1hJ1IZ3AeKaOQ3nsSfcF9Irys0HZLxFYIBbAZruEQuE=
814-
github.com/onflow/flow-emulator v1.7.2/go.mod h1:0sx/W4sutaMpDBs60frpJRiYAgQbZcakMH8mWq+k3Js=
813+
github.com/onflow/flow-emulator v1.7.5-0.20251003113055-b2aa4e72fe6c h1:OWV/GTewWejsTIH/gPyTf9JyEY1PAyxa6Kh6kYxOikg=
814+
github.com/onflow/flow-emulator v1.7.5-0.20251003113055-b2aa4e72fe6c/go.mod h1:mMQfSBQ3D3z/n00kzEa5h3B8dND64ER3jbvsuM25o7s=
815815
github.com/onflow/flow-evm-bridge v0.1.0 h1:7X2osvo4NnQgHj8aERUmbYtv9FateX8liotoLnPL9nM=
816816
github.com/onflow/flow-evm-bridge v0.1.0/go.mod h1:5UYwsnu6WcBNrwitGFxphCl5yq7fbWYGYuiCSTVF6pk=
817817
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3SsEftzXG2JlmSe24=
818818
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
819819
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
820820
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
821-
github.com/onflow/flow-go v0.43.1-rc.4.0.20250930135247-97f6643af6f8 h1:WuuYhrXQfqYpOPXUsyq2fbPtx8uiXSMuxHOUJdqGVIY=
822-
github.com/onflow/flow-go v0.43.1-rc.4.0.20250930135247-97f6643af6f8/go.mod h1:Ra4VlmRlJsh73TIMDQ3mDS00Kuuy2UgIpvBtoTN+ETI=
821+
github.com/onflow/flow-go v0.43.1-rc.4.0.20251003084044-7de2383796cb h1:yLmYLRlyuSeAggJvLJijf5L0YEVEpBpHVsRhw6eRHfM=
822+
github.com/onflow/flow-go v0.43.1-rc.4.0.20251003084044-7de2383796cb/go.mod h1:Ra4VlmRlJsh73TIMDQ3mDS00Kuuy2UgIpvBtoTN+ETI=
823823
github.com/onflow/flow-go-sdk v1.8.2 h1:Jkoh0LdH4kIADFdHoHK31qHcH0QnCkAL+ybjAkBEbqc=
824824
github.com/onflow/flow-go-sdk v1.8.2/go.mod h1:/5g1t+xgk1nFXz8ifk8O3aT4DqLwq5p3k2BhiW4ZX+U=
825825
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=

‎tests/helpers.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func startEmulator(createTestAccounts bool) (*server.EmulatorServer, error) {
9393
TransactionExpiry: 10,
9494
TransactionMaxGasLimit: flow.DefaultMaxTransactionGasLimit,
9595
SetupEVMEnabled: true,
96-
SetupVMBridgeEnabled: false,
96+
SetupVMBridgeEnabled: true,
9797
})
9898

9999
go func() {
@@ -243,19 +243,19 @@ func setupTestAccounts(emu emulator.Emulator) error {
243243
self.fundVault <- vaultRef.withdraw(amount: 10.0) as! @FlowToken.Vault
244244
self.auth = signer
245245
246-
if !signer.storage.check<@EVM.CadenceOwnedAccount>(from: /storage/evm) {
246+
if !signer.storage.check<@EVM.CadenceOwnedAccount>(from: /storage/evm_coa) {
247247
signer.storage.save<@EVM.CadenceOwnedAccount>(
248248
<- EVM.createCadenceOwnedAccount(),
249-
to: /storage/evm
249+
to: /storage/evm_coa
250250
)
251251
}
252252
253253
if !signer.capabilities.exists(/public/evm) {
254-
let cap = signer.capabilities.storage.issue<&EVM.CadenceOwnedAccount>(/storage/evm)
254+
let cap = signer.capabilities.storage.issue<&EVM.CadenceOwnedAccount>(/storage/evm_coa)
255255
signer.capabilities.publish(cap, at: /public/evm)
256256
}
257257
258-
self.coa = signer.storage.borrow<auth(EVM.Call) &EVM.CadenceOwnedAccount>(from: /storage/evm)!
258+
self.coa = signer.storage.borrow<auth(EVM.Call) &EVM.CadenceOwnedAccount>(from: /storage/evm_coa)!
259259
}
260260
261261
execute {

‎tests/web3js/eth_non_interactive_test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ it('should get fee history', async () => {
389389
oldestBlock: 1n,
390390
reward: [['0x96'], ['0x96'], ['0x96']], // gas price is 150 during testing
391391
baseFeePerGas: [1n, 1n, 1n],
392-
gasUsedRatio: [0, 0.006205458333333334, 0]
392+
gasUsedRatio: [0.066314225, 0.006205458333333334, 0]
393393
}
394394
)
395395
})

0 commit comments

Comments
 (0)