PR fixes

- Add state overrides to arbitrum.EstimateGas
- Non-functional change to EncodeIndex to avoid future merge conflicts.

arbitrum/export.go

@@ -11,8 +11,8 @@ import (
 
 type TransactionArgs = ethapi.TransactionArgs
 
-func EstimateGas(ctx context.Context, b ethapi.Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, gasCap uint64) (hexutil.Uint64, error) {
-	return ethapi.DoEstimateGas(ctx, b, args, blockNrOrHash, nil, gasCap)
+func EstimateGas(ctx context.Context, b ethapi.Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *ethapi.StateOverride, gasCap uint64) (hexutil.Uint64, error) {
+	return ethapi.DoEstimateGas(ctx, b, args, blockNrOrHash, overrides, gasCap)
 }
 
 func NewRevertReason(result *core.ExecutionResult) error {

core/types/receipt.go

@@ -380,10 +380,14 @@ func (rs Receipts) EncodeIndex(i int, w *bytes.Buffer) {
 	switch r.Type {
 	case AccessListTxType, DynamicFeeTxType, BlobTxType:
 		rlp.Encode(w, data)
-	default:
+	case ArbitrumDepositTxType, ArbitrumUnsignedTxType, ArbitrumContractTxType, ArbitrumRetryTxType, ArbitrumSubmitRetryableTxType, ArbitrumInternalTxType:
 		// Arbitrum: same as above, but this should help prevent future merge conflicts,
 		// by keeping above case statement the same.
 		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.
 	}
 }