forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix conflicts

Browse source
This commit is contained in:
Shawn 2024-04-17 18:52:14 -07:00
parent f8319151a4
commit 8eff8952ac
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/vm/contracts_with_ctx.go
View file

@ -2,6 +2,9 @@ package vm
import ( import (
"fmt" "fmt"
"github.com/holiman/uint256"
"math/big" "math/big"
"time" "time"
@ -9,7 +12,6 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/holiman/uint256"
) )
// Wrapper type which allows PrecompiledContract to be used as PrecompiledContractWithCtx // Wrapper type which allows PrecompiledContract to be used as PrecompiledContractWithCtx

1
tests/fuzzers/bls12381/precompile_fuzzer.go
View file

@ -19,6 +19,7 @@ package bls
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"math/big" "math/big"
"time" "time"