From 1e3c8e75a6827959e49677ce529452ac8af38b92 Mon Sep 17 00:00:00 2001
From: Jordan Oroshiba <jordan@astria.org>
Date: Mon, 10 Mar 2025 14:40:30 -0700
Subject: [PATCH] change deposit tx type key

---
 core/txpool/legacypool/legacypool.go | 16 ++++++++--------
 core/txpool/validation.go            |  4 +++-
 core/types/deposit_tx.go             | 17 ++++++++---------
 core/types/transaction.go            |  2 +-
 grpc/shared/rollupdata_handling.go   |  4 ++--
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go
index ae5e0edcd..5d7c3fa81 100644
--- a/core/txpool/legacypool/legacypool.go
+++ b/core/txpool/legacypool/legacypool.go
@@ -306,7 +306,7 @@ func (ao *astriaOrdered) clear() {
 }
 
 func (pool *LegacyPool) ValidateTx(tx *types.Transaction) error {
-	return pool.validateTxBasics(tx, false)
+	return pool.validateTxBasics(tx, false, false)
 }
 
 func (pool *LegacyPool) SetAstriaOrdered(txs types.Transactions) {
@@ -314,7 +314,7 @@ func (pool *LegacyPool) SetAstriaOrdered(txs types.Transactions) {
 
 	valid := []*types.Transaction{}
 	for idx, tx := range txs {
-		err := pool.validateTxBasics(tx, false)
+		err := pool.validateTxBasics(tx, false, true)
 		if err != nil {
 			log.Warn("astria tx failed validation", "index", idx, "hash", tx.Hash(), "error", err)
 			continue
@@ -706,16 +706,16 @@ func (pool *LegacyPool) local() map[common.Address]types.Transactions {
 // rules, but does not check state-dependent validation such as sufficient balance.
 // This check is meant as an early check which only needs to be performed once,
 // and does not require the pool mutex to be held.
-func (pool *LegacyPool) validateTxBasics(tx *types.Transaction, local bool) error {
+func (pool *LegacyPool) validateTxBasics(tx *types.Transaction, local bool, isAstriaOrdered bool) error {
 	opts := &txpool.ValidationOptions{
 		Config: pool.chainconfig,
 		Accept: 0 |
 			1<<types.LegacyTxType |
 			1<<types.AccessListTxType |
-			1<<types.DynamicFeeTxType |
-			1<<types.DepositTxType,
-		MaxSize: txMaxSize,
-		MinTip:  pool.gasTip.Load().ToBig(),
+			1<<types.DynamicFeeTxType,
+		MaxSize:        txMaxSize,
+		MinTip:         pool.gasTip.Load().ToBig(),
+		AcceptDeposits: isAstriaOrdered,
 	}
 	if local {
 		opts.MinTip = new(big.Int)
@@ -1096,7 +1096,7 @@ func (pool *LegacyPool) Add(txs []*types.Transaction, local, sync bool) []error
 		// Exclude transactions with basic errors, e.g invalid signatures and
 		// insufficient intrinsic gas as soon as possible and cache senders
 		// in transactions before obtaining lock
-		if err := pool.validateTxBasics(tx, local); err != nil {
+		if err := pool.validateTxBasics(tx, local, false); err != nil {
 			errs[i] = err
 			log.Trace("Discarding invalid transaction", "hash", tx.Hash(), "err", err)
 			invalidTxMeter.Mark(1)
diff --git a/core/txpool/validation.go b/core/txpool/validation.go
index d6031f3c6..64be1ccda 100644
--- a/core/txpool/validation.go
+++ b/core/txpool/validation.go
@@ -45,6 +45,8 @@ type ValidationOptions struct {
 	Accept  uint8    // Bitmap of transaction types that should be accepted for the calling pool
 	MaxSize uint64   // Maximum size of a transaction that the caller can meaningfully handle
 	MinTip  *big.Int // Minimum gas tip needed to allow a transaction into the caller pool
+
+	AcceptDeposits bool // Whether the pool accepts deposit transactions
 }
 
 // ValidateTransaction is a helper method to check whether a transaction is valid
@@ -59,7 +61,7 @@ func ValidateTransaction(tx *types.Transaction, head *types.Header, signer types
 	}
 
 	// Ensure transactions not implemented by the calling pool are rejected
-	if opts.Accept&(1<<tx.Type()) == 0 {
+	if opts.Accept&(1<<tx.Type()) == 0 && !(tx.Type() == types.DepositTxType && opts.AcceptDeposits == true) {
 		return fmt.Errorf("%w: tx type %v not supported by this pool", core.ErrTxTypeNotSupported, tx.Type())
 	}
 	// Before performing any expensive validations, sanity check that the tx is
diff --git a/core/types/deposit_tx.go b/core/types/deposit_tx.go
index 6b0e60ecc..127e32449 100644
--- a/core/types/deposit_tx.go
+++ b/core/types/deposit_tx.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"
-	primitivev1 "buf.build/gen/go/astria/primitives/protocolbuffers/go/astria/primitive/v1"
 )
 
 var _ TxData = &DepositTx{}
@@ -26,8 +25,8 @@ type DepositTx struct {
 	// to the `mint` function calldata.
 	Data []byte
 	// the transaction ID of the source action for the deposit, consisting
-  	// of the transaction hash.
-	SourceTransactionId primitivev1.TransactionId
+	// of the transaction hash.
+	SourceTransactionId string
 	// index of the deposit's source action within its transaction
 	SourceTransactionIndex uint64
 }
@@ -39,12 +38,12 @@ func (tx *DepositTx) copy() TxData {
 	}
 
 	cpy := &DepositTx{
-		From:  tx.From,
-		Value: new(big.Int),
-		Gas:   tx.Gas,
-		To:    to,
-		Data:  make([]byte, len(tx.Data)),
-		SourceTransactionId: tx.SourceTransactionId,
+		From:                   tx.From,
+		Value:                  new(big.Int),
+		Gas:                    tx.Gas,
+		To:                     to,
+		Data:                   make([]byte, len(tx.Data)),
+		SourceTransactionId:    tx.SourceTransactionId,
 		SourceTransactionIndex: tx.SourceTransactionIndex,
 	}
 
diff --git a/core/types/transaction.go b/core/types/transaction.go
index 7a2114e06..ab24e01d2 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -49,7 +49,7 @@ const (
 	AccessListTxType = 0x01
 	DynamicFeeTxType = 0x02
 	BlobTxType       = 0x03
-	DepositTxType    = 0x04
+	DepositTxType    = 0x5a
 )
 
 // Transaction is an Ethereum transaction.
diff --git a/grpc/shared/rollupdata_handling.go b/grpc/shared/rollupdata_handling.go
index cd1282935..159cc26bd 100644
--- a/grpc/shared/rollupdata_handling.go
+++ b/grpc/shared/rollupdata_handling.go
@@ -92,7 +92,7 @@ func validateAndUnmarshalDepositTx(
 			Gas:                    64000,
 			To:                     &bac.Erc20Asset.ContractAddress,
 			Data:                   calldata,
-			SourceTransactionId:    *deposit.SourceTransactionId,
+			SourceTransactionId:    deposit.SourceTransactionId.Inner,
 			SourceTransactionIndex: deposit.SourceActionIndex,
 		}
 
@@ -105,7 +105,7 @@ func validateAndUnmarshalDepositTx(
 		To:                     &recipient,
 		Value:                  amount,
 		Gas:                    0,
-		SourceTransactionId:    *deposit.SourceTransactionId,
+		SourceTransactionId:    deposit.SourceTransactionId.Inner,
 		SourceTransactionIndex: deposit.SourceActionIndex,
 	}
 	return types.NewTx(&txdata), nil