From c0c638fd92d6c4af254cf21858925e6d59b7d6fd Mon Sep 17 00:00:00 2001 From: cby3149 Date: Tue, 29 Oct 2024 11:17:43 -0700 Subject: [PATCH 1/4] Enable TestEIP1559Params test --- op-e2e/external_erigon/test_parms.json | 3 +-- op-erigon/go.mod | 4 ++-- op-erigon/go.sum | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/op-e2e/external_erigon/test_parms.json b/op-e2e/external_erigon/test_parms.json index 1a6445ca92d2..1ea5168510e9 100644 --- a/op-e2e/external_erigon/test_parms.json +++ b/op-e2e/external_erigon/test_parms.json @@ -21,7 +21,6 @@ "TestPreregolith/UnusedGasConsumed_RegolithNotYetActive": "Erigon doesn't reject building the block when the gas exceeds the block gas limit; instead, it discards transactions until they fit within the block", "TestMultipleGameTypes": "TODO, this should be investigated, is probably the debug_dbGet though", "TestSendRawTransactionConditionalEnabled": "TODO, this new feature should be added to Erigon", - "TestSendRawTransactionConditionalTxForwarding": "TODO, this new feature should be added to Erigon", - "TestEIP1559Params": "TODO, this new feature should be added to Erigon" + "TestSendRawTransactionConditionalTxForwarding": "TODO, this new feature should be added to Erigon" } } diff --git a/op-erigon/go.mod b/op-erigon/go.mod index ef132e117680..86a164331b17 100644 --- a/op-erigon/go.mod +++ b/op-erigon/go.mod @@ -256,8 +256,8 @@ require ( zombiezen.com/go/sqlite v0.13.1 // indirect ) -replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241025172136-afc04920f125 +replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029171812-730c13f66090 replace github.com/tendermint/tendermint => github.com/bnb-chain/tendermint v0.31.12 -replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241025172136-afc04920f125 +replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241029171812-730c13f66090 diff --git a/op-erigon/go.sum b/op-erigon/go.sum index 0c69491e29b5..39791c34d004 100644 --- a/op-erigon/go.sum +++ b/op-erigon/go.sum @@ -167,10 +167,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA= github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bobanetwork/op-erigon v1.9.7-0.20241025172136-afc04920f125 h1:m+kHc6jQktbBWmgKLrYb3TVk/1yDBXHIv8C21ZrSjbo= -github.com/bobanetwork/op-erigon v1.9.7-0.20241025172136-afc04920f125/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241025172136-afc04920f125 h1:fvz36ye3LjDuVm7KVLF30V4VcpLNk2zATBJwFIWTbpA= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241025172136-afc04920f125/go.mod h1:S4mcboN3Vc2cOJ6ctwRktUvgzvrzE6ZmwtVLltTbjJU= +github.com/bobanetwork/op-erigon v1.9.7-0.20241029171812-730c13f66090 h1:SmMFJr7K5q3GyUkHAUfIQkHrd3mMqpljbOiACf++Iaw= +github.com/bobanetwork/op-erigon v1.9.7-0.20241029171812-730c13f66090/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029171812-730c13f66090 h1:jx9qY5CfWcsVjszOOPG/GEpksp7UEkvdK4frvJ1HI3w= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029171812-730c13f66090/go.mod h1:MYbeMroF/hDyVaaX6ZVq8WhEOZthqiC6SrqujMiXJLk= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= From aadd32fafd39c13fb8f9a15e78f43b849d7d9a37 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Tue, 29 Oct 2024 12:35:37 -0700 Subject: [PATCH 2/4] Update erigon commit hash --- op-erigon/go.mod | 4 ++-- op-erigon/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/op-erigon/go.mod b/op-erigon/go.mod index 86a164331b17..9d1f93e09f53 100644 --- a/op-erigon/go.mod +++ b/op-erigon/go.mod @@ -256,8 +256,8 @@ require ( zombiezen.com/go/sqlite v0.13.1 // indirect ) -replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029171812-730c13f66090 +replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029193316-849a19ca9767 replace github.com/tendermint/tendermint => github.com/bnb-chain/tendermint v0.31.12 -replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241029171812-730c13f66090 +replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241029193316-849a19ca9767 diff --git a/op-erigon/go.sum b/op-erigon/go.sum index 39791c34d004..25f5fd709d63 100644 --- a/op-erigon/go.sum +++ b/op-erigon/go.sum @@ -167,10 +167,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA= github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bobanetwork/op-erigon v1.9.7-0.20241029171812-730c13f66090 h1:SmMFJr7K5q3GyUkHAUfIQkHrd3mMqpljbOiACf++Iaw= -github.com/bobanetwork/op-erigon v1.9.7-0.20241029171812-730c13f66090/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029171812-730c13f66090 h1:jx9qY5CfWcsVjszOOPG/GEpksp7UEkvdK4frvJ1HI3w= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029171812-730c13f66090/go.mod h1:MYbeMroF/hDyVaaX6ZVq8WhEOZthqiC6SrqujMiXJLk= +github.com/bobanetwork/op-erigon v1.9.7-0.20241029193316-849a19ca9767 h1:xc+6vlSPxhgzLtRTWuBmhsseMFu+2zqsu5LcHxWEQR4= +github.com/bobanetwork/op-erigon v1.9.7-0.20241029193316-849a19ca9767/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029193316-849a19ca9767 h1:fgEUBSRKzz1mY5HVgbSmFukoMoiVSywa7OLkd79fldU= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029193316-849a19ca9767/go.mod h1:MYbeMroF/hDyVaaX6ZVq8WhEOZthqiC6SrqujMiXJLk= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= From fba478aee597f088e83e1408233353036b23f648 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Wed, 30 Oct 2024 10:42:12 -0700 Subject: [PATCH 3/4] Update erigon version --- op-erigon/go.mod | 4 ++-- op-erigon/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/op-erigon/go.mod b/op-erigon/go.mod index 9d1f93e09f53..e1a5409c4a38 100644 --- a/op-erigon/go.mod +++ b/op-erigon/go.mod @@ -256,8 +256,8 @@ require ( zombiezen.com/go/sqlite v0.13.1 // indirect ) -replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029193316-849a19ca9767 +replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241030170358-4e96db8ecbd2 replace github.com/tendermint/tendermint => github.com/bnb-chain/tendermint v0.31.12 -replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241029193316-849a19ca9767 +replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241030170358-4e96db8ecbd2 diff --git a/op-erigon/go.sum b/op-erigon/go.sum index 25f5fd709d63..8a3349021c79 100644 --- a/op-erigon/go.sum +++ b/op-erigon/go.sum @@ -167,10 +167,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA= github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bobanetwork/op-erigon v1.9.7-0.20241029193316-849a19ca9767 h1:xc+6vlSPxhgzLtRTWuBmhsseMFu+2zqsu5LcHxWEQR4= -github.com/bobanetwork/op-erigon v1.9.7-0.20241029193316-849a19ca9767/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029193316-849a19ca9767 h1:fgEUBSRKzz1mY5HVgbSmFukoMoiVSywa7OLkd79fldU= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241029193316-849a19ca9767/go.mod h1:MYbeMroF/hDyVaaX6ZVq8WhEOZthqiC6SrqujMiXJLk= +github.com/bobanetwork/op-erigon v1.9.7-0.20241030170358-4e96db8ecbd2 h1:qHEhvCGm6dDGMrURwUiLD8HHwyfMw1kfHzzOVf/KxVg= +github.com/bobanetwork/op-erigon v1.9.7-0.20241030170358-4e96db8ecbd2/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241030170358-4e96db8ecbd2 h1:DWKOkAVP6DMDoD6XYL1EcK0QNllthkwckuTF0tn2WwU= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241030170358-4e96db8ecbd2/go.mod h1:MYbeMroF/hDyVaaX6ZVq8WhEOZthqiC6SrqujMiXJLk= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= From e1a69ef4965f5411d5817ff7d923a3cfbd65ac79 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Thu, 31 Oct 2024 11:30:47 -0700 Subject: [PATCH 4/4] Update erigon version --- op-erigon/go.mod | 4 ++-- op-erigon/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/op-erigon/go.mod b/op-erigon/go.mod index e1a5409c4a38..5be510e84977 100644 --- a/op-erigon/go.mod +++ b/op-erigon/go.mod @@ -256,8 +256,8 @@ require ( zombiezen.com/go/sqlite v0.13.1 // indirect ) -replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241030170358-4e96db8ecbd2 +replace github.com/ledgerwatch/erigon-lib => github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241031182336-ad2f95a2486a replace github.com/tendermint/tendermint => github.com/bnb-chain/tendermint v0.31.12 -replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241030170358-4e96db8ecbd2 +replace github.com/ledgerwatch/erigon => github.com/bobanetwork/op-erigon v1.9.7-0.20241031182336-ad2f95a2486a diff --git a/op-erigon/go.sum b/op-erigon/go.sum index 8a3349021c79..406e6a7cbcfa 100644 --- a/op-erigon/go.sum +++ b/op-erigon/go.sum @@ -167,10 +167,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA= github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bobanetwork/op-erigon v1.9.7-0.20241030170358-4e96db8ecbd2 h1:qHEhvCGm6dDGMrURwUiLD8HHwyfMw1kfHzzOVf/KxVg= -github.com/bobanetwork/op-erigon v1.9.7-0.20241030170358-4e96db8ecbd2/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241030170358-4e96db8ecbd2 h1:DWKOkAVP6DMDoD6XYL1EcK0QNllthkwckuTF0tn2WwU= -github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241030170358-4e96db8ecbd2/go.mod h1:MYbeMroF/hDyVaaX6ZVq8WhEOZthqiC6SrqujMiXJLk= +github.com/bobanetwork/op-erigon v1.9.7-0.20241031182336-ad2f95a2486a h1:yRAO+5G8FkdaefD3Nj43D5rhsBwvr5HnHCtZEm6JQYQ= +github.com/bobanetwork/op-erigon v1.9.7-0.20241031182336-ad2f95a2486a/go.mod h1:9IGAErMx/oTFnZCAWCHrxbLh3Ef63frBofSqwc9ZrYk= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241031182336-ad2f95a2486a h1:P340VhzYRCkdKrcRur2EE3EvvLTwJYqlCBei77UKivY= +github.com/bobanetwork/op-erigon/erigon-lib v0.0.0-20241031182336-ad2f95a2486a/go.mod h1:MYbeMroF/hDyVaaX6ZVq8WhEOZthqiC6SrqujMiXJLk= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo=