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

[Flow EVM] update EVM version to the one supporting configurable precompiles #5524

Merged
merged 15 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
update evm to use the forked branch
  • Loading branch information
ramtinms committed Mar 7, 2024
commit d94ef3f732672be13e2e1ff7e06cdd095b2db676
14 changes: 9 additions & 5 deletions fvm/evm/emulator/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package emulator

Check failure on line 1 in fvm/evm/emulator/config.go

View workflow job for this annotation

GitHub Actions / Lint (./)

: # github.com/onflow/flow-go/fvm/evm/emulator

import (
"math"
Expand Down Expand Up @@ -31,8 +31,6 @@
TxContext *gethVM.TxContext
// base unit of gas for direct calls
DirectCallBaseGasUsage uint64
// a set of extra precompiles to be injected
ExtraPrecompiles map[gethCommon.Address]gethVM.PrecompiledContract
}

func (c *Config) ChainRules() gethParams.Rules {
Expand Down Expand Up @@ -96,6 +94,7 @@
GetHash: func(n uint64) gethCommon.Hash {
return gethCommon.Hash{}
},
GetPrecompile: gethCore.GetPrecompile,
},
}
}
Expand Down Expand Up @@ -186,11 +185,16 @@
// WithExtraPrecompiles appends precompile list with extra precompiles
func WithExtraPrecompiles(precompiles []types.Precompile) Option {
return func(c *Config) *Config {
extraPreCompMap := make(map[gethCommon.Address]gethVM.PrecompiledContract)
for _, pc := range precompiles {
if c.ExtraPrecompiles == nil {
c.ExtraPrecompiles = make(map[gethCommon.Address]gethVM.PrecompiledContract)
extraPreCompMap[pc.Address().ToCommon()] = pc
}
c.BlockContext.GetPrecompile = func(rules gethParams.Rules, addr gethCommon.Address) (gethVM.PrecompiledContract, bool) {
prec, found := extraPreCompMap[addr]
if found {
return prec, true
}
c.ExtraPrecompiles[pc.Address().ToCommon()] = pc
return gethCore.GetPrecompile(rules, addr)
}
return c
}
Expand Down
32 changes: 0 additions & 32 deletions fvm/evm/emulator/emulator.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import (
"math/big"
"sync"

gethCommon "github.com/ethereum/go-ethereum/common"
gethCore "github.com/ethereum/go-ethereum/core"
Expand All @@ -17,8 +16,6 @@
"github.com/onflow/flow-go/model/flow"
)

var pcUpdater = &precompileUpdater{}

// Emulator handles operations against evm runtime
type Emulator struct {
rootAddr flow.Address
Expand Down Expand Up @@ -61,7 +58,7 @@
// NewBlockView constructs a new block view (mutable)
func (em *Emulator) NewBlockView(ctx types.BlockContext) (types.BlockView, error) {
cfg := newConfig(ctx)
pcUpdater.SetupPrecompile(cfg)

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Lint (./)

undefined: pcUpdater (typecheck)

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Lint (./)

undefined: pcUpdater) (typecheck)

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Lint (./)

undefined: pcUpdater) (typecheck)

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/ingestion)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/ingestion)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/ingestion)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/ingestion)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/ingestion)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/verification)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/verification)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/verification)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/verification)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/verification)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/computation)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/computation)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/computation)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/computation)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution/computation)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (admin)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (admin)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (admin)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (admin)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (admin)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/collection)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/collection)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/collection)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (fvm)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/collection)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/collection)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/execution)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (storage)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (storage)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (storage)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (storage)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (storage)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/access)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/access)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/access)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/access)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/access)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (utils)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (utils)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (utils)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (utils)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (utils)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (consensus)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (consensus)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (consensus)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (consensus)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (consensus)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (others)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (others)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (others)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (others)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (others)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (cmd)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (cmd)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (cmd)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (cmd)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/common)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/common)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/common)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine/common)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (engine)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (module)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (module)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (module)

undefined: pcUpdater

Check failure on line 61 in fvm/evm/emulator/emulator.go

View workflow job for this annotation

GitHub Actions / Unit Tests (module)

undefined: pcUpdater
return &BlockView{
config: cfg,
rootAddr: em.rootAddr,
Expand Down Expand Up @@ -437,32 +434,3 @@
}
return &res, nil
}

type precompileUpdater struct {
updateLock sync.Mutex
}

func (pu *precompileUpdater) SetupPrecompile(cfg *Config) {
pu.updateLock.Lock()
defer pu.updateLock.Unlock()

rules := cfg.ChainRules()
// captures the pointer to the map that has to be augmented
var precompiles map[gethCommon.Address]gethVM.PrecompiledContract
switch {
case rules.IsCancun:
precompiles = gethVM.PrecompiledContractsCancun
case rules.IsBerlin:
precompiles = gethVM.PrecompiledContractsBerlin
case rules.IsIstanbul:
precompiles = gethVM.PrecompiledContractsIstanbul
case rules.IsByzantium:
precompiles = gethVM.PrecompiledContractsByzantium
default:
precompiles = gethVM.PrecompiledContractsHomestead
}
for addr, contract := range cfg.ExtraPrecompiles {
// we override if exist since we call this method on every block
precompiles[addr] = contract
}
}
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -319,3 +319,5 @@ require (

// Using custom fork until https://github.com/onflow/flow-go/issues/5338 is resolved
replace github.com/ipfs/boxo => github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483

replace github.com/ethereum/go-ethereum v1.13.5 => github.com/onflow/go-ethereum v0.0.2
Copy link
Contributor

Choose a reason for hiding this comment

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

This will break the build for anyone importing flow-go as a dependency (that didn't copy this replace). Would it make sense to just change all the imports?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried that, unfortunately, it won't work unless we replace a lot of internal references in the onflow/go-ethereum.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let me try one more time

4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,6 @@ github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHj
github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
github.com/ethereum/go-ethereum v1.9.9/go.mod h1:a9TqabFudpDu1nucId+k9S8R9whYaHnGBLKFouA5EAo=
github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk=
github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0=
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
Expand Down Expand Up @@ -1372,6 +1370,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9j
github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk=
github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v0.0.2 h1:7XU/gmJp4fi7FWgZllCpxg22ZwytwDqwnE6/wBCxOEg=
github.com/onflow/go-ethereum v0.0.2/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8=
github.com/onflow/sdks v0.5.0/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds=
Expand Down
2 changes: 2 additions & 0 deletions insecure/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -303,3 +303,5 @@ require (
)

replace github.com/onflow/flow-go => ../

replace github.com/ethereum/go-ethereum v1.13.5 => github.com/onflow/go-ethereum v0.0.2
4 changes: 2 additions & 2 deletions insecure/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,6 @@ github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHj
github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
github.com/ethereum/go-ethereum v1.9.9/go.mod h1:a9TqabFudpDu1nucId+k9S8R9whYaHnGBLKFouA5EAo=
github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk=
github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0=
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
Expand Down Expand Up @@ -1335,6 +1333,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9j
github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk=
github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v0.0.2 h1:7XU/gmJp4fi7FWgZllCpxg22ZwytwDqwnE6/wBCxOEg=
github.com/onflow/go-ethereum v0.0.2/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8=
github.com/onflow/sdks v0.5.0/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds=
Expand Down
2 changes: 2 additions & 0 deletions integration/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -361,3 +361,5 @@ require (
replace github.com/onflow/flow-go => ../

replace github.com/onflow/flow-go/insecure => ../insecure

replace github.com/ethereum/go-ethereum v1.13.5 => github.com/onflow/go-ethereum v0.0.2
Copy link
Contributor

Choose a reason for hiding this comment

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

should we match versions (tag onflow/go-ethereum with same tag from which it's based of, so we don't make mistakes in future)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, going to update the version to a proper one after we merge the changes on the other PR

4 changes: 2 additions & 2 deletions integration/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,6 @@ github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHj
github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
github.com/ethereum/go-ethereum v1.9.9/go.mod h1:a9TqabFudpDu1nucId+k9S8R9whYaHnGBLKFouA5EAo=
github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk=
github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0=
github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
Expand Down Expand Up @@ -1429,6 +1427,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9j
github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk=
github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v0.0.2 h1:7XU/gmJp4fi7FWgZllCpxg22ZwytwDqwnE6/wBCxOEg=
github.com/onflow/go-ethereum v0.0.2/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead h1:2j1Unqs76Z1b95Gu4C3Y28hzNUHBix7wL490e61SMSw=
github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead/go.mod h1:E3ScfQb5XcWJCIAdtIeEnr5i5l2y60GT0BTXeIHseWg=
github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8=
Expand Down
Loading