remove GetAuthorization function from Transaction interface

erigontech · Jul 12, 2024 · f92c5ed · f92c5ed
1 parent 7f6416e
commit f92c5ed
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/core/state_transition.go b/core/state_transition.go
@@ -390,7 +390,7 @@ func (st *StateTransition) TransitionDb(refunds bool, gasBailout bool) (*evmtype
 
 			// 6. add authority account to accesses_addresses
 			verifiedAuthorities = append(verifiedAuthorities, authority)
-			// authority is added to acceessed_address in prepare step
+			// authority is added to accessed_address in prepare step
 		}
 	}
 

diff --git a/core/types/blob_tx_wrapper.go b/core/types/blob_tx_wrapper.go
@@ -319,7 +319,6 @@ func (txw *BlobTxWrapper) GetGas() uint64                     { return txw.Tx.Ge
 func (txw *BlobTxWrapper) GetBlobGas() uint64                 { return txw.Tx.GetBlobGas() }
 func (txw *BlobTxWrapper) GetValue() *uint256.Int             { return txw.Tx.GetValue() }
 func (txw *BlobTxWrapper) GetTo() *libcommon.Address          { return txw.Tx.GetTo() }
-func (txw *BlobTxWrapper) GetAuthorizations() []Authorization { return txw.Tx.GetAuthorizations() }
 
 func (txw *BlobTxWrapper) AsMessage(s Signer, baseFee *big.Int, rules *chain.Rules) (Message, error) {
 	return txw.Tx.AsMessage(s, baseFee, rules)

diff --git a/core/types/legacy_tx.go b/core/types/legacy_tx.go
@@ -94,10 +94,6 @@ func (ct *CommonTx) GetBlobHashes() []libcommon.Hash {
 	return []libcommon.Hash{}
 }
 
-func (ct *CommonTx) GetAuthorizations() []Authorization {
-	return nil
-}
-
 // LegacyTx is the transaction data of regular Ethereum transactions.
 type LegacyTx struct {
 	CommonTx

diff --git a/core/types/set_code_tx.go b/core/types/set_code_tx.go
@@ -32,6 +32,10 @@ func (tx *SetCodeTransaction) GetBlobHashes() []libcommon.Hash {
 	return []libcommon.Hash{}
 }
 
+func (tx *SetCodeTransaction) GetAuthorizations() []Authorization {
+	return tx.Authorizations
+}
+
 func (tx *SetCodeTransaction) copy() *SetCodeTransaction {
 	cpy := &SetCodeTransaction{}
 	cpy.DynamicFeeTransaction = *tx.DynamicFeeTransaction.copy()

diff --git a/core/types/transaction.go b/core/types/transaction.go
@@ -72,7 +72,6 @@ type Transaction interface {
 	GetBlobGas() uint64
 	GetValue() *uint256.Int
 	GetTo() *libcommon.Address
-	GetAuthorizations() []Authorization
 	AsMessage(s Signer, baseFee *big.Int, rules *chain.Rules) (Message, error)
 	WithSignature(signer Signer, sig []byte) (Transaction, error)
 	FakeSign(address libcommon.Address) Transaction

diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go
@@ -74,7 +74,11 @@ func (tt *TransactionTest) Run(chainID *big.Int) error {
 		sender := msg.From()
 
 		// Intrinsic gas
-		requiredGas, err := core.IntrinsicGas(msg.Data(), msg.AccessList(), msg.To() == nil, rules.IsHomestead, rules.IsIstanbul, rules.IsShanghai, uint64(len(tx.GetAuthorizations())))
+		authorizationsLen := uint64(0)
+		if stx, ok := tx.(*types.SetCodeTransaction); ok {
+			authorizationsLen = uint64(len(stx.GetAuthorizations()))
+		}
+		requiredGas, err := core.IntrinsicGas(msg.Data(), msg.AccessList(), msg.To() == nil, rules.IsHomestead, rules.IsIstanbul, rules.IsShanghai, authorizationsLen)
 		if err != nil {
 			return nil, nil, 0, err
 		}

diff --git a/turbo/jsonrpc/eth_api.go b/turbo/jsonrpc/eth_api.go
@@ -461,8 +461,9 @@ func NewRPCTransaction(txn types.Transaction, blockHash common.Hash, blockNumber
 			result.MaxFeePerBlobGas = (*hexutil.Big)(blobTx.MaxFeePerBlobGas.ToBig())
 			result.BlobVersionedHashes = blobTx.BlobVersionedHashes
 		} else if txn.Type() == types.SetCodeTxType {
-			ats := make([]types.JsonAuthorization, len(txn.GetAuthorizations()))
-			for i, a := range txn.GetAuthorizations() {
+			setCodeTx := txn.(*types.SetCodeTransaction)
+			ats := make([]types.JsonAuthorization, len(setCodeTx.GetAuthorizations()))
+			for i, a := range setCodeTx.GetAuthorizations() {
 				ats[i] = types.JsonAuthorization{}.FromAuthorization(a)
 			}
 			result.Authorizations = &ats