update for new op-geth version (#5)

(cherry picked from commit 0b09e1c)

Author: Rjected

go.mod

@@ -250,7 +250,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.14.8 => github.com/paradigmxyz/op-geth v0.0.0-20240912202626-841fcd6ec768
+replace github.com/ethereum/go-ethereum => github.com/paradigmxyz/op-geth v0.0.0-20250124010715-5401c129acb0
 
 //replace github.com/ethereum/go-ethereum => ../op-geth
 

go.sum

@@ -225,7 +225,7 @@ func getRandomSignedTransaction(ctx context.Context, ethClient *ethclient.Client
 	var txData types.TxData
 	switch txType {
 	case types.LegacyTxType:
-		gasLimit, err := core.IntrinsicGas(data, nil, false, true, true, false)
+		gasLimit, err := core.IntrinsicGas(data, nil, nil, false, true, true, false)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get intrinsicGas: %w", err)
 		}
@@ -242,7 +242,7 @@ func getRandomSignedTransaction(ctx context.Context, ethClient *ethclient.Client
 			Address:     randomAddress,
 			StorageKeys: []common.Hash{common.HexToHash("0x1234")},
 		}}
-		gasLimit, err := core.IntrinsicGas(data, accessList, false, true, true, false)
+		gasLimit, err := core.IntrinsicGas(data, accessList, nil, false, true, true, false)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get intrinsicGas: %w", err)
 		}
@@ -257,7 +257,7 @@ func getRandomSignedTransaction(ctx context.Context, ethClient *ethclient.Client
 			Data:       data,
 		}
 	case types.DynamicFeeTxType:
-		gasLimit, err := core.IntrinsicGas(data, nil, false, true, true, false)
+		gasLimit, err := core.IntrinsicGas(data, nil, nil, false, true, true, false)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get intrinsicGas: %w", err)
 		}
@@ -275,6 +275,7 @@ func getRandomSignedTransaction(ctx context.Context, ethClient *ethclient.Client
 			Value:     amount,
 			Data:      data,
 		}
+		// TODO: SetCodeTx
 	default:
 		return nil, fmt.Errorf("unsupported tx type: %d", txType)
 	}

op-chain-ops/cmd/check-derivation/main.go

@@ -278,8 +278,8 @@ func (fst *ForkableState) GetCode(address common.Address) []byte {
 	return fst.stateFor(address).GetCode(address)
 }
 
-func (fst *ForkableState) SetCode(address common.Address, bytes []byte) {
-	fst.stateFor(address).SetCode(address, bytes)
+func (fst *ForkableState) SetCode(address common.Address, bytes []byte) []byte {
+	return fst.stateFor(address).SetCode(address, bytes)
 }
 
 func (fst *ForkableState) GetCodeSize(address common.Address) int {

op-chain-ops/script/forking/state.go

@@ -230,7 +230,7 @@ func asTxCandidate(bcast script.Broadcast, blockGasLimit uint64) txmgr.TxCandida
 // is clamped to the block gas limit since Geth will reject transactions that exceed it before letting them
 // into the mempool.
 func padGasLimit(data []byte, gasUsed uint64, creation bool, blockGasLimit uint64) uint64 {
-	intrinsicGas, err := core.IntrinsicGas(data, nil, creation, true, true, false)
+	intrinsicGas, err := core.IntrinsicGas(data, nil, nil, creation, true, true, false)
 	// This method never errors - we should look into it if it does.
 	if err != nil {
 		panic(err)

op-deployer/pkg/deployer/broadcaster/keyed.go

@@ -343,7 +343,7 @@ func (s *L2Batcher) ActL2BatchSubmitRaw(t Testing, payload []byte, txOpts ...fun
 			opt(rawTx)
 		}
 
-		gas, err := core.IntrinsicGas(rawTx.Data, nil, false, true, true, false)
+		gas, err := core.IntrinsicGas(rawTx.Data, nil, nil, false, true, true, false)
 		require.NoError(t, err, "need to compute intrinsic gas")
 		rawTx.Gas = gas
 		txData = rawTx

op-e2e/actions/helpers/l2_batcher.go

@@ -52,7 +52,7 @@ type spanBatchSetCodeTxData struct {
 	GasFeeCap  *uint256.Int // a.k.a. maxFeePerGas
 	Data       []byte
 	AccessList types.AccessList
-	AuthList   types.AuthorizationList
+	AuthList   []types.SetCodeAuthorization
 }
 
 func (txData *spanBatchSetCodeTxData) txType() byte { return types.SetCodeTxType }
@@ -195,7 +195,7 @@ func (tx *spanBatchTx) convertToFullTx(nonce, gas uint64, to *common.Address, ch
 			GasTipCap:  batchTxInner.GasTipCap,
 			GasFeeCap:  batchTxInner.GasFeeCap,
 			Gas:        gas,
-			To:         to,
+			To:         *to,
 			Value:      batchTxInner.Value,
 			Data:       batchTxInner.Data,
 			AccessList: batchTxInner.AccessList,
@@ -242,7 +242,7 @@ func newSpanBatchTx(tx *types.Transaction) (*spanBatchTx, error) {
 			Value:      uint256.MustFromBig(tx.Value()),
 			Data:       tx.Data(),
 			AccessList: tx.AccessList(),
-			AuthList:   tx.AuthList(),
+			AuthList:   tx.SetCodeAuthorizations(),
 		}
 	default:
 		return nil, fmt.Errorf("invalid tx type: %d", tx.Type())