From f1c80f7e79631ee246d56de58822619c692ebab6 Mon Sep 17 00:00:00 2001 From: meows Date: Thu, 21 Sep 2023 09:46:04 -0600 Subject: [PATCH 1/7] params: bump version from v1.12.14-unstable to v1.12.14-stable Date: 2023-09-21 09:46:04-06:00 Signed-off-by: meows --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 45a52d2ed0..3780038992 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 12 // Minor version component of the current release - VersionPatch = 14 // Patch version component of the current release - VersionMeta = "unstable" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 12 // Minor version component of the current release + VersionPatch = 14 // Patch version component of the current release + VersionMeta = "stable" // Version metadata to append to the version string VersionName = "CoreGeth" ) From c7d09e2eff3e57a38d37bb234439734cad936e7c Mon Sep 17 00:00:00 2001 From: meows Date: Thu, 21 Sep 2023 09:46:44 -0600 Subject: [PATCH 2/7] params: bump version from v1.12.14-stable to v1.12.15-unstable Date: 2023-09-21 09:46:44-06:00 Signed-off-by: meows --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 3780038992..97faf85072 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 12 // Minor version component of the current release - VersionPatch = 14 // Patch version component of the current release - VersionMeta = "stable" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 12 // Minor version component of the current release + VersionPatch = 15 // Patch version component of the current release + VersionMeta = "unstable" // Version metadata to append to the version string VersionName = "CoreGeth" ) From e3dfe6716db5d24a4a7e8f293d6027efd416b3ba Mon Sep 17 00:00:00 2001 From: lumat Date: Sun, 24 Sep 2023 07:43:32 +0200 Subject: [PATCH 3/7] Fix panic in lyra2 when mining --- consensus/lyra2/consensus.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus/lyra2/consensus.go b/consensus/lyra2/consensus.go index ba6f35ed01..8a00eb10d6 100644 --- a/consensus/lyra2/consensus.go +++ b/consensus/lyra2/consensus.go @@ -394,7 +394,7 @@ func (lyra2 *Lyra2) FinalizeAndAssemble(chain consensus.ChainHeaderReader, heade header.Root = state.IntermediateRoot(chain.Config().IsEnabled(chain.Config().GetEIP161dTransition, header.Number)) // Header seems complete, assemble into a block and return - return types.NewBlock(header, txs, uncles, receipts, new(trie.Trie)), nil + return types.NewBlock(header, txs, uncles, receipts, trie.NewStackTrie(nil)), nil } // SealHash returns the hash of a block prior to it being sealed. From 1ed450a0bf67da7dea706e02e3fb8de4bf3aac0d Mon Sep 17 00:00:00 2001 From: meows Date: Tue, 10 Oct 2023 11:25:31 -0600 Subject: [PATCH 4/7] consensus/ethash: remove spurious conditions preventing EIP3860, EIP4844 w/ Ethash These conditions prevented the enabling of these EIPs with the Ethash consensus engine by throwing an error if they were enabled during header verification. This behavior is incompatible with ETC's planned use of these features, so we should remove these conditions from header verification and allow these EIPs to be enabled with Ethash configuration. I see no conceptual reason why 3860= limit and meter init code and 4844= blob tx types can not be used with Ethash pow block sealing. Date: 2023-10-10 11:25:31-06:00 Signed-off-by: meows --- consensus/ethash/consensus.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 45c21b4540..4310c813d2 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -278,12 +278,7 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa if diff := new(big.Int).Sub(header.Number, parent.Number); diff.Cmp(big.NewInt(1)) != 0 { return consensus.ErrInvalidNumber } - if chain.Config().IsEnabledByTime(chain.Config().GetEIP3860TransitionTime, &header.Time) || chain.Config().IsEnabled(chain.Config().GetEIP3860Transition, header.Number) { - return fmt.Errorf("ethash does not support shanghai fork") - } - if chain.Config().IsEnabledByTime(chain.Config().GetEIP4844TransitionTime, &header.Time) { - return fmt.Errorf("ethash does not support cancun fork") - } + // Verify the engine specific seal securing the block if seal { if err := ethash.verifySeal(chain, header, false); err != nil { From 3b026679832f0d02ef921b92f902f4f6633f1875 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 20:46:35 +0000 Subject: [PATCH 5/7] build(deps): bump gitpython from 3.1.32 to 3.1.37 Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.32 to 3.1.37. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.32...3.1.37) --- updated-dependencies: - dependency-name: gitpython dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements-mkdocs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-mkdocs.txt b/requirements-mkdocs.txt index 329fa2e8aa..cd745cad2f 100644 --- a/requirements-mkdocs.txt +++ b/requirements-mkdocs.txt @@ -2,7 +2,7 @@ Babel==2.9.1 click==7.1.2 future==0.18.3 gitdb==4.0.5 -GitPython==3.1.32 +GitPython==3.1.37 htmlmin==0.1.12 Jinja2==3.0.2 joblib==1.2.0 From cb877dd8edf0fd87540c274d9bb55f4a8a2beaa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:38:51 +0000 Subject: [PATCH 6/7] build(deps): bump golang.org/x/net from 0.10.0 to 0.17.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.10.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.10.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 14c4ed73e5..417a191027 100644 --- a/go.mod +++ b/go.mod @@ -73,11 +73,11 @@ require ( github.com/urfave/cli/v2 v2.24.1 github.com/xeipuuv/gojsonschema v1.2.0 go.uber.org/automaxprocs v1.5.2 - golang.org/x/crypto v0.9.0 + golang.org/x/crypto v0.14.0 golang.org/x/exp v0.0.0-20230810033253-352e893a4cad golang.org/x/sync v0.3.0 - golang.org/x/sys v0.9.0 - golang.org/x/text v0.9.0 + golang.org/x/sys v0.13.0 + golang.org/x/text v0.13.0 golang.org/x/time v0.3.0 golang.org/x/tools v0.9.1 gonum.org/v1/gonum v0.14.0 @@ -163,7 +163,7 @@ require ( github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect golang.org/x/image v0.7.0 // indirect golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.10.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 96b734ba01..f7ab841980 100644 --- a/go.sum +++ b/go.sum @@ -564,8 +564,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230810033253-352e893a4cad h1:g0bG7Z4uG+OgH2QDODnjp6ggkk1bJDsINcuWmJN1iJU= golang.org/x/exp v0.0.0-20230810033253-352e893a4cad/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= @@ -613,8 +613,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -670,8 +670,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -685,8 +685,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= From 33f4f8b2e0e42fd3a1b5e5c3bdb50573ba948b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20L=C3=B3pez=20Le=C3=B3n?= Date: Wed, 25 Oct 2023 16:42:35 -0300 Subject: [PATCH 7/7] core/forkid,params: set Spiral Mordor activation number (#571) --- core/forkid/forkid_test.go | 9 ++++++--- params/config_mordor.go | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index 04582e0541..680e10b41a 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -184,8 +184,11 @@ func TestCreation(t *testing.T) { {3_985_893, 0, ID{Hash: checksumToBytes(0x92b323e0), Next: 5_520_000}}, {3_985_894, 0, ID{Hash: checksumToBytes(0x92b323e0), Next: 5_520_000}}, {5_519_999, 0, ID{Hash: checksumToBytes(0x92b323e0), Next: 5_520_000}}, - {5_520_000, 0, ID{Hash: checksumToBytes(0x8c9b1797), Next: 0}}, - {5_520_001, 0, ID{Hash: checksumToBytes(0x8c9b1797), Next: 0}}, + {5_520_000, 0, ID{Hash: checksumToBytes(0x8c9b1797), Next: 9_957_000}}, + {5_520_001, 0, ID{Hash: checksumToBytes(0x8c9b1797), Next: 9_957_000}}, + {9_956_999, 0, ID{Hash: checksumToBytes(0x8c9b1797), Next: 9_957_000}}, + {9_957_000, 0, ID{Hash: checksumToBytes(0x3a6b00d7), Next: 0}}, + {9_957_001, 0, ID{Hash: checksumToBytes(0x3a6b00d7), Next: 0}}, }, }, // MintMe test cases @@ -497,7 +500,7 @@ func TestGatherForks(t *testing.T) { { "mordor", params.MordorChainConfig, - []uint64{301_243, 999_983, 2_520_000, 3_985_893, 5_520_000}, + []uint64{301_243, 999_983, 2_520_000, 3_985_893, 5_520_000, 9_957_000}, }, { "mintme", diff --git a/params/config_mordor.go b/params/config_mordor.go index a1dd40dc02..59de8ed1f6 100644 --- a/params/config_mordor.go +++ b/params/config_mordor.go @@ -82,11 +82,11 @@ var ( // Spiral, aka Shanghai (partially) // EIP4399FBlock: nil, // Supplant DIFFICULTY with PREVRANDAO. ETC does not spec 4399 because it's still PoW, and 4399 is only applicable for the PoS system. - EIP3651FBlock: nil, // Warm COINBASE (gas reprice) - EIP3855FBlock: nil, // PUSH0 instruction - EIP3860FBlock: nil, // Limit and meter initcode + EIP3651FBlock: big.NewInt(9_957_000), // Warm COINBASE (gas reprice) + EIP3855FBlock: big.NewInt(9_957_000), // PUSH0 instruction + EIP3860FBlock: big.NewInt(9_957_000), // Limit and meter initcode // EIP4895FBlock: nil, // Beacon chain push withdrawals as operations - EIP6049FBlock: nil, // Deprecate SELFDESTRUCT (noop) + EIP6049FBlock: big.NewInt(9_957_000), // Deprecate SELFDESTRUCT (noop) DisposalBlock: big.NewInt(0), ECIP1017FBlock: big.NewInt(0),