Skip to content

Commit 095b379

Browse files
fjlstevemilk
fjl
authored and
stevemilk
committed
version: release go-ethereum v1.14.13 stable
1 parent 5c66ec5 commit 095b379

File tree

14 files changed

+30
-26
lines changed

14 files changed

+30
-26
lines changed

‎core/gendata/aeneid/genesis.json

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"arrowGlacierBlock": 0,
1515
"grayGlacierBlock": 0,
1616
"terminalTotalDifficulty": 0,
17-
"terminalTotalDifficultyPassed": true,
1817
"shanghaiTime": 0,
1918
"cancunTime": 0
2019
},

‎core/gendata/local/genesis.json

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"arrowGlacierBlock": 0,
1515
"grayGlacierBlock": 0,
1616
"terminalTotalDifficulty": 0,
17-
"terminalTotalDifficultyPassed": true,
1817
"shanghaiTime": 0,
1918
"cancunTime": 0
2019
},

‎core/gendata/story/genesis.json

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"arrowGlacierBlock": 0,
1515
"grayGlacierBlock": 0,
1616
"terminalTotalDifficulty": 0,
17-
"terminalTotalDifficultyPassed": true,
1817
"shanghaiTime": 0,
1918
"cancunTime": 0
2019
},

‎core/types/transaction_signing.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func LatestSigner(config *params.ChainConfig) Signer {
6767
var signer Signer
6868
if config.ChainID != nil {
6969
switch {
70-
case config.CancunTime != nil:
70+
case config.CancunTime != nil && config.Is4844Enabled():
7171
signer = NewCancunSigner(config.ChainID)
7272
case config.LondonBlock != nil:
7373
signer = NewLondonSigner(config.ChainID)

‎core/vm/contracts.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ var PrecompiledContractsBerlin = PrecompiledContracts{
104104

105105
// PrecompiledContractsCancun contains the default set of pre-compiled Ethereum
106106
// contracts used in the Cancun release.
107-
var PrecompiledContractsCancun = map[common.Address]PrecompiledContract{
107+
var PrecompiledContractsCancun = PrecompiledContracts{
108108
common.BytesToAddress([]byte{0x1}): &ecrecover{},
109109
common.BytesToAddress([]byte{0x2}): &sha256hash{},
110110
common.BytesToAddress([]byte{0x3}): &ripemd160hash{},

‎core/vm/contracts_fuzz_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
package vm
1818

1919
import (
20-
"github.com/ethereum/go-ethereum/core/rawdb"
20+
"testing"
21+
2122
"github.com/ethereum/go-ethereum/core/state"
2223
"github.com/ethereum/go-ethereum/core/types"
2324
"github.com/ethereum/go-ethereum/params"
2425
"github.com/holiman/uint256"
25-
"testing"
2626

2727
"github.com/ethereum/go-ethereum/common"
2828
)
@@ -43,7 +43,7 @@ func FuzzPrecompiledContracts(f *testing.F) {
4343
vmctx := BlockContext{
4444
Transfer: func(StateDB, common.Address, common.Address, *uint256.Int) {},
4545
}
46-
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
46+
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabaseForTesting())
4747
evm := NewEVM(vmctx, TxContext{}, statedb, params.AllEthashProtocolChanges, Config{})
4848
inWant := string(input)
4949
RunPrecompiledContract(evm, p, input, gas, nil)

‎core/vm/contracts_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"testing"
2626
"time"
2727

28-
"github.com/ethereum/go-ethereum/core/rawdb"
2928
"github.com/ethereum/go-ethereum/core/state"
3029
"github.com/ethereum/go-ethereum/core/types"
3130
"github.com/ethereum/go-ethereum/params"
@@ -109,7 +108,7 @@ func testPrecompiled(addr string, test precompiledTest, t *testing.T) {
109108
vmctx := BlockContext{
110109
Transfer: func(StateDB, common.Address, common.Address, *uint256.Int) {},
111110
}
112-
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
111+
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabaseForTesting())
113112
evm := NewEVM(vmctx, TxContext{}, statedb, params.AllEthashProtocolChanges, Config{})
114113
t.Run(fmt.Sprintf("%s-Gas=%d", test.Name, gas), func(t *testing.T) {
115114
if res, _, err := RunPrecompiledContract(evm, p, in, gas, nil); err != nil {
@@ -136,7 +135,7 @@ func testPrecompiledOOG(addr string, test precompiledTest, t *testing.T) {
136135
vmctx := BlockContext{
137136
Transfer: func(StateDB, common.Address, common.Address, *uint256.Int) {},
138137
}
139-
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
138+
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabaseForTesting())
140139
evm := NewEVM(vmctx, TxContext{}, statedb, params.AllEthashProtocolChanges, Config{})
141140

142141
t.Run(fmt.Sprintf("%s-Gas=%d", test.Name, gas), func(t *testing.T) {
@@ -160,7 +159,7 @@ func testPrecompiledFailure(addr string, test precompiledFailureTest, t *testing
160159
vmctx := BlockContext{
161160
Transfer: func(StateDB, common.Address, common.Address, *uint256.Int) {},
162161
}
163-
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
162+
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabaseForTesting())
164163
evm := NewEVM(vmctx, TxContext{}, statedb, params.AllEthashProtocolChanges, Config{})
165164

166165
t.Run(test.Name, func(t *testing.T) {
@@ -198,7 +197,7 @@ func benchmarkPrecompiled(addr string, test precompiledTest, bench *testing.B) {
198197
vmctx := BlockContext{
199198
Transfer: func(StateDB, common.Address, common.Address, *uint256.Int) {},
200199
}
201-
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
200+
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabaseForTesting())
202201
evm := NewEVM(vmctx, TxContext{}, statedb, params.AllEthashProtocolChanges, Config{})
203202
copy(data, in)
204203
res, _, err = RunPrecompiledContract(evm, p, data, reqGas, nil)

‎eth/backend.go

+9
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,15 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
272272
}
273273
eth.APIBackend.gpo = gasprice.NewOracle(eth.APIBackend, config.GPO, config.Miner.GasPrice)
274274

275+
// Initialize the guardian module
276+
guardian.InitInstance(config.Guardian)
277+
278+
// Initialize the whitelist module
279+
err = guardian.InitWhiteList(config.WhiteList)
280+
if err != nil {
281+
return nil, err
282+
}
283+
275284
// Start the RPC service
276285
eth.netRPCService = ethapi.NewNetAPI(eth.p2pServer, networkID)
277286

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ require (
7272
golang.org/x/text v0.21.0
7373
golang.org/x/time v0.5.0
7474
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
75-
google.golang.org/protobuf v1.33.0
75+
google.golang.org/protobuf v1.34.2
7676
gopkg.in/natefinch/lumberjack.v2 v2.2.1
7777
gopkg.in/yaml.v3 v3.0.1
7878
)

‎go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -556,8 +556,6 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F
556556
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
557557
github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg=
558558
github.com/twmb/murmur3 v1.1.6/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
559-
github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
560-
github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
561559
github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
562560
github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
563561
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
@@ -892,8 +890,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
892890
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
893891
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
894892
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
895-
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
896-
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
893+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
894+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
897895
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
898896
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
899897
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎internal/ethapi/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3291,7 +3291,7 @@ type precompileContract struct{}
32913291

32923292
func (p *precompileContract) RequiredGas(input []byte) uint64 { return 0 }
32933293

3294-
func (p *precompileContract) Run(input []byte) ([]byte, error) { return nil, nil }
3294+
func (p *precompileContract) Run(evm *vm.EVM, input []byte) ([]byte, error) { return nil, nil }
32953295

32963296
func TestStateOverrideMovePrecompile(t *testing.T) {
32973297
db := state.NewDatabase(triedb.NewDatabase(rawdb.NewMemoryDatabase(), nil), nil)

‎params/config.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,10 @@ var (
242242
CancunTime: nil,
243243
PragueTime: nil,
244244
VerkleTime: nil,
245-
TerminalTotalDifficulty: nil,
245+
TerminalTotalDifficulty: big.NewInt(math.MaxInt64),
246246
Ethash: new(EthashConfig),
247247
Clique: nil,
248+
Enable4844: true,
248249
}
249250

250251
AllDevChainProtocolChanges = &ChainConfig{

‎tests/fuzzers/bls12381/precompile_fuzzer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package bls
1919
import (
2020
"bytes"
2121
"fmt"
22-
"github.com/ethereum/go-ethereum/core/rawdb"
22+
2323
"github.com/ethereum/go-ethereum/core/state"
2424
"github.com/ethereum/go-ethereum/core/types"
2525
"github.com/ethereum/go-ethereum/params"
@@ -78,7 +78,7 @@ func fuzz(id byte, data []byte) int {
7878
vmctx := vm.BlockContext{
7979
Transfer: func(vm.StateDB, common.Address, common.Address, *uint256.Int) {},
8080
}
81-
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
81+
statedb, _ := state.New(types.EmptyRootHash, state.NewDatabaseForTesting())
8282
evm := vm.NewEVM(vmctx, vm.TxContext{}, statedb, params.AllEthashProtocolChanges, vm.Config{})
8383
// Even on bad input, it should not crash, so we still test the gas calc
8484
precompile := vm.PrecompiledContractsBLS[common.BytesToAddress([]byte{id})]

‎version/version.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package version
1818

1919
const (
20-
Major = 1 // Major version component of the current release
21-
Minor = 14 // Minor version component of the current release
22-
Patch = 12 // Patch version component of the current release
23-
Meta = "stable" // Version metadata to append to the version string
20+
Major = 1 // Major version component of the current release
21+
Minor = 0 // Minor version component of the current release
22+
Patch = 3 // Patch version component of the current release
23+
Meta = "unstable" // Version metadata to append to the version string
2424
)

0 commit comments

Comments
 (0)