update geth dependency

bnb-chain · Feb 6, 2025 · c7bb986 · c7bb986
1 parent 30945b3
commit c7bb986
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -277,7 +277,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.13.15 => github.com/krish-nr/op-geth v0.2.2-rc.1.0.20241226015808-4d92fe224340
+replace github.com/ethereum/go-ethereum v1.13.15 => github.com/bnb-chain/op-geth v1.101315.2-0.0.20241227085525-b47710880c69
 
 replace github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.0.0
 

diff --git a/go.sum b/go.sum
@@ -184,6 +184,8 @@ github.com/bnb-chain/fastssz v0.1.2 h1:vTcXw5SwCtRYnl/BEclujiml7GXiVOZ74tub4GHpv
 github.com/bnb-chain/fastssz v0.1.2/go.mod h1:KcabV+OEw2QwgyY8Fc88ZG79CKYkFdu0kKWyfA3dI6o=
 github.com/bnb-chain/greenfield-cometbft v1.0.0 h1:0r6hOJWD/+es0gxP/exKuN/krgXAr3LCn5/XlcgDWr8=
 github.com/bnb-chain/greenfield-cometbft v1.0.0/go.mod h1:f35mk/r5ab6yvzlqEWZt68LfUje68sYgMpVlt2CUYMk=
+github.com/bnb-chain/op-geth v1.101315.2-0.0.20241227085525-b47710880c69 h1:5//2TuCoaoE9Ihp4jW4AuQlZvxU+jJNiY9BiNHse1gA=
+github.com/bnb-chain/op-geth v1.101315.2-0.0.20241227085525-b47710880c69/go.mod h1:hyHrrcHkUe3lRwfJs+JGrbOHp+pRdheRk+ren4TPhF8=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
@@ -931,8 +933,6 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/krish-nr/op-geth v0.2.2-rc.1.0.20241226015808-4d92fe224340 h1:ez7r25x9QqapSj3ohHDdm7EqjqJINMR2//tUSZMeP3g=
-github.com/krish-nr/op-geth v0.2.2-rc.1.0.20241226015808-4d92fe224340/go.mod h1:hyHrrcHkUe3lRwfJs+JGrbOHp+pRdheRk+ren4TPhF8=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=

diff --git a/op-node/rollup/derive/span_batch_tx.go b/op-node/rollup/derive/span_batch_tx.go
@@ -91,7 +91,7 @@ func (tx *spanBatchTx) decodeTyped(b []byte) (spanBatchTxData, error) {
 		return nil, fmt.Errorf("failed to decode span batch: %w", ErrTypedTxTooShort)
 	}
 	switch b[0] {
-	case types.AccessListTxType: //有了
+	case types.AccessListTxType:
 		var inner spanBatchAccessListTxData
 		err := rlp.DecodeBytes(b[1:], &inner)
 		if err != nil {
@@ -156,7 +156,7 @@ func (tx *spanBatchTx) convertToFullTx(nonce, gas uint64, to *common.Address, ch
 			R:        R,
 			S:        S,
 		}
-	case types.AccessListTxType: //有了
+	case types.AccessListTxType:
 		batchTxInner := tx.inner.(*spanBatchAccessListTxData)
 		inner = &types.AccessListTx{
 			ChainID:    chainID,
@@ -220,7 +220,7 @@ func newSpanBatchTx(tx types.Transaction) (*spanBatchTx, error) {
 			Value:    tx.Value(),
 			Data:     tx.Data(),
 		}
-	case types.AccessListTxType: //有了
+	case types.AccessListTxType:
 		inner = &spanBatchAccessListTxData{
 			GasPrice:   tx.GasPrice(),
 			Value:      tx.Value(),

diff --git a/op-node/rollup/derive/span_batch_txs.go b/op-node/rollup/derive/span_batch_txs.go
@@ -267,7 +267,7 @@ func (btx *spanBatchTxs) recoverV(chainID *big.Int) error {
 				// EIP-155
 				v = chainID.Uint64()*2 + 35 + bit
 			}
-		case types.AccessListTxType: //有了
+		case types.AccessListTxType:
 			v = bit
 		case types.DynamicFeeTxType:
 			v = bit
@@ -384,7 +384,7 @@ func convertVToYParity(v uint64, txType int) (uint, error) {
 			// unprotected legacy txs must have v = 27 or 28
 			yParityBit = uint(v - 27)
 		}
-	case types.AccessListTxType: //有了
+	case types.AccessListTxType:
 		yParityBit = uint(v)
 	case types.DynamicFeeTxType:
 		yParityBit = uint(v)

diff --git a/op-program/client/mpt/db.go b/op-program/client/mpt/db.go
@@ -13,6 +13,42 @@ type DB struct {
 	db Hooks
 }
 
+func (p *DB) StateStoreReader() ethdb.Reader {
+	panic("not supported")
+}
+
+func (p *DB) BlockStoreReader() ethdb.Reader {
+	panic("not supported")
+}
+
+func (p *DB) BlockStoreWriter() ethdb.Writer {
+	panic("not supported")
+}
+
+func (p *DB) StateStore() ethdb.Database {
+	panic("not supported")
+}
+
+func (p *DB) SetStateStore(state ethdb.Database) {
+	panic("not supported")
+}
+
+func (p *DB) GetStateStore() ethdb.Database {
+	panic("not supported")
+}
+
+func (p *DB) BlockStore() ethdb.Database {
+	panic("not supported")
+}
+
+func (p *DB) SetBlockStore(block ethdb.Database) {
+	panic("not supported")
+}
+
+func (p *DB) HasSeparateBlockStore() bool {
+	panic("not supported")
+}
+
 func (p *DB) Has(key []byte) (bool, error) {
 	panic("not supported")
 }