forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #941 from gzliudan/rollback-eip1559

Browse source 
all: bump version to v2.6.1-beta
This commit is contained in:
benjamin202410 2025-04-13 14:39:43 -07:00 committed by GitHub
commit 4a8800674d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cicd/devnet/genesis.json
View file

@ -7,7 +7,7 @@
"eip155Block": 0, "eip155Block": 0,
"eip158Block": 0, "eip158Block": 0,
"byzantiumBlock": 0, "byzantiumBlock": 0,
"eip1559Block": 0, "eip1559Block": 32400,
"XDPoS": { "XDPoS": {
"period": 2, "period": 2,
"epoch": 900, "epoch": 900,

8
common/constants.devnet.go
View file

@ -16,18 +16,18 @@ var DevnetConstant = constant{
tipXDCX: big.NewInt(0), tipXDCX: big.NewInt(0),
tipXDCXLending: big.NewInt(0), tipXDCXLending: big.NewInt(0),
tipXDCXCancellationFee: big.NewInt(0), tipXDCXCancellationFee: big.NewInt(0),
tipTRC21Fee: big.NewInt(13523400), tipTRC21Fee: big.NewInt(10800),
tipIncreaseMasternodes: big.NewInt(0), tipIncreaseMasternodes: big.NewInt(0),
berlinBlock: big.NewInt(0), berlinBlock: big.NewInt(0),
londonBlock: big.NewInt(0), londonBlock: big.NewInt(0),
mergeBlock: big.NewInt(0), mergeBlock: big.NewInt(0),
shanghaiBlock: big.NewInt(0), shanghaiBlock: big.NewInt(0),
blockNumberGas50x: big.NewInt(0), blockNumberGas50x: big.NewInt(21600),
TIPV2SwitchBlock: big.NewInt(0), TIPV2SwitchBlock: big.NewInt(0),
tipXDCXMinerDisable: big.NewInt(0), tipXDCXMinerDisable: big.NewInt(0),
tipXDCXReceiverDisable: big.NewInt(0), tipXDCXReceiverDisable: big.NewInt(0),
eip1559Block: big.NewInt(0), eip1559Block: big.NewInt(32400),
cancunBlock: big.NewInt(1702800), cancunBlock: big.NewInt(43200),
tipUpgradeReward: big.NewInt(1773000), tipUpgradeReward: big.NewInt(1773000),
tipEpochHalving: big.NewInt(9999999999), tipEpochHalving: big.NewInt(9999999999),

2
common/constants.testnet.go
View file

@ -27,7 +27,7 @@ var TestnetConstant = constant{
tipXDCXMinerDisable: big.NewInt(61290000), // Target 31st March 2024 tipXDCXMinerDisable: big.NewInt(61290000), // Target 31st March 2024
tipXDCXReceiverDisable: big.NewInt(66825000), // Target 26 Aug 2024 tipXDCXReceiverDisable: big.NewInt(66825000), // Target 26 Aug 2024
eip1559Block: big.NewInt(71550000), // Target 14th Feb 2025 eip1559Block: big.NewInt(71550000), // Target 14th Feb 2025
cancunBlock: big.NewInt(73425600), cancunBlock: big.NewInt(71550000),
tipUpgradeReward: big.NewInt(9999999999), tipUpgradeReward: big.NewInt(9999999999),
tipEpochHalving: big.NewInt(9999999999), tipEpochHalving: big.NewInt(9999999999),

2
core/types/hashing_test.go
View file

@ -43,7 +43,7 @@ func TestEIP2718DeriveSha(t *testing.T) {
}{ }{
{ {
rlpData: "0xb8a701f8a486796f6c6f763380843b9aca008262d4948a8eafb1cf62bfbeb1741769dae1a9dd479961928080f838f7940000000000000000000000000000000000001337e1a0000000000000000000000000000000000000000000000000000000000000000080a0775101f92dcca278a56bfe4d613428624a1ebfc3cd9e0bcc1de80c41455b9021a06c9deac205afe7b124907d4ba54a9f46161498bd3990b90d175aac12c9a40ee9", rlpData: "0xb8a701f8a486796f6c6f763380843b9aca008262d4948a8eafb1cf62bfbeb1741769dae1a9dd479961928080f838f7940000000000000000000000000000000000001337e1a0000000000000000000000000000000000000000000000000000000000000000080a0775101f92dcca278a56bfe4d613428624a1ebfc3cd9e0bcc1de80c41455b9021a06c9deac205afe7b124907d4ba54a9f46161498bd3990b90d175aac12c9a40ee9",
exp: "01 b8a701f8a486796f6c6f763380843b9aca008262d4948a8eafb1cf62bfbeb1741769dae1a9dd479961928080f838f7940000000000000000000000000000000000001337e1a0000000000000000000000000000000000000000000000000000000000000000080a0775101f92dcca278a56bfe4d613428624a1ebfc3cd9e0bcc1de80c41455b9021a06c9deac205afe7b124907d4ba54a9f46161498bd3990b90d175aac12c9a40ee9\n80 b8a701f8a486796f6c6f763380843b9aca008262d4948a8eafb1cf62bfbeb1741769dae1a9dd479961928080f838f7940000000000000000000000000000000000001337e1a0000000000000000000000000000000000000000000000000000000000000000080a0775101f92dcca278a56bfe4d613428624a1ebfc3cd9e0bcc1de80c41455b9021a06c9deac205afe7b124907d4ba54a9f46161498bd3990b90d175aac12c9a40ee9\n", exp: "01 01f8a486796f6c6f763380843b9aca008262d4948a8eafb1cf62bfbeb1741769dae1a9dd479961928080f838f7940000000000000000000000000000000000001337e1a0000000000000000000000000000000000000000000000000000000000000000080a0775101f92dcca278a56bfe4d613428624a1ebfc3cd9e0bcc1de80c41455b9021a06c9deac205afe7b124907d4ba54a9f46161498bd3990b90d175aac12c9a40ee9\n80 01f8a486796f6c6f763380843b9aca008262d4948a8eafb1cf62bfbeb1741769dae1a9dd479961928080f838f7940000000000000000000000000000000000001337e1a0000000000000000000000000000000000000000000000000000000000000000080a0775101f92dcca278a56bfe4d613428624a1ebfc3cd9e0bcc1de80c41455b9021a06c9deac205afe7b124907d4ba54a9f46161498bd3990b90d175aac12c9a40ee9\n",
}, },
} { } {
d := &hashToHumanReadable{} d := &hashToHumanReadable{}

14
core/types/receipt.go
View file

@ -382,11 +382,19 @@ func (rs Receipts) Len() int { return len(rs) }
// EncodeIndex encodes the i'th receipt to w. // EncodeIndex encodes the i'th receipt to w.
func (rs Receipts) EncodeIndex(i int, w *bytes.Buffer) { func (rs Receipts) EncodeIndex(i int, w *bytes.Buffer) {
r := rs[i] r := rs[i]
data := &receiptRLP{r.statusEncoding(), r.CumulativeGasUsed, r.Bloom, r.Logs}
if r.Type == LegacyTxType { if r.Type == LegacyTxType {
data := &receiptRLP{r.statusEncoding(), r.CumulativeGasUsed, r.Bloom, r.Logs}
rlp.Encode(w, data) rlp.Encode(w, data)
} else { return
rlp.Encode(w, r) }
w.WriteByte(r.Type)
switch r.Type {
case AccessListTxType, DynamicFeeTxType:
rlp.Encode(w, data)
default:
// For unsupported types, write nothing. Since this is for
// DeriveSha, the error will be caught matching the derived hash
// to the block.
} }
} }

2
core/types/transaction.go
View file

@ -640,7 +640,7 @@ func (s Transactions) EncodeIndex(i int, w *bytes.Buffer) {
if tx.Type() == LegacyTxType { if tx.Type() == LegacyTxType {
rlp.Encode(w, tx.inner) rlp.Encode(w, tx.inner)
} else { } else {
rlp.Encode(w, tx) tx.encodeTyped(w)
} }
} }

2
genesis/devnet.json
View file

@ -7,7 +7,7 @@
"eip155Block": 0, "eip155Block": 0,
"eip158Block": 0, "eip158Block": 0,
"byzantiumBlock": 0, "byzantiumBlock": 0,
"eip1559Block": 0, "eip1559Block": 32400,
"XDPoS": { "XDPoS": {
"period": 2, "period": 2,
"epoch": 900, "epoch": 900,

2
params/config.go
View file

@ -35,7 +35,7 @@ const (
var ( var (
MainnetGenesisHash = common.HexToHash("0x4a9d748bd78a8d0385b67788c2435dcdb914f98a96250b68863a1f8b7642d6b1") // XDC Mainnet genesis hash to enforce below configs on MainnetGenesisHash = common.HexToHash("0x4a9d748bd78a8d0385b67788c2435dcdb914f98a96250b68863a1f8b7642d6b1") // XDC Mainnet genesis hash to enforce below configs on
TestnetGenesisHash = common.HexToHash("0xbdea512b4f12ff1135ec92c00dc047ffb93890c2ea1aa0eefe9b013d80640075") // XDC Testnet genesis hash to enforce below configs on TestnetGenesisHash = common.HexToHash("0xbdea512b4f12ff1135ec92c00dc047ffb93890c2ea1aa0eefe9b013d80640075") // XDC Testnet genesis hash to enforce below configs on
DevnetGenesisHash = common.HexToHash("0x977c7a1b4ecbc40acc3963c1778666b62a95940a7fba6fec5867f78702835daf") // XDC Devnet genesis hash to enforce below configs on DevnetGenesisHash = common.HexToHash("0x3c636c841ebee9121374fa76bd5480d17a23e1ba61d425dde21d7b3caba864f4") // XDC Devnet genesis hash to enforce below configs on
) )
var ( var (

8
params/version.go
View file

@ -21,10 +21,10 @@ import (
) )
const ( const (
VersionMajor = 2 // Major version component of the current release VersionMajor = 2 // Major version component of the current release
VersionMinor = 4 // Minor version component of the current release VersionMinor = 6 // Minor version component of the current release
VersionPatch = 6 // Patch version component of the current release VersionPatch = 1 // Patch version component of the current release
VersionMeta = "beta1" // Version metadata to append to the version string VersionMeta = "beta" // Version metadata to append to the version string
) )
// Version holds the textual version string. // Version holds the textual version string.