take in bridge addresses and allowed asset ids in ValidateAndUnmarsha…

…lSequencerTx

grpc/execution/server.go

@@ -240,7 +240,7 @@ func (s *ExecutionServiceServerV1Alpha2) ExecuteBlock(ctx context.Context, req *
 
 	txsToProcess := types.Transactions{}
 	for _, tx := range req.Transactions {
-		unmarshalledTx, err := s.ValidateAndUnmarshalSequencerTx(tx)
+		unmarshalledTx, err := ValidateAndUnmarshalSequencerTx(tx, s.bridgeAddresses, s.bridgeAllowedAssetIDs)
 		if err != nil {
 			log.Error("failed to validate sequencer tx, ignoring", "tx", tx, "err", err)
 			continue

grpc/execution/validation.go

@@ -7,13 +7,14 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/params"
 )
 
 // if sequencer tx is valid, then a unmarshalled ethereum transaction is returned. if not valid, nil is returned
-func (s *ExecutionServiceServerV1Alpha2) ValidateAndUnmarshalSequencerTx(tx *sequencerblockv1alpha1.RollupData) (*types.Transaction, error) {
+func ValidateAndUnmarshalSequencerTx(tx *sequencerblockv1alpha1.RollupData, bridgeAddresses map[string]*params.AstriaBridgeAddressConfig, bridgeAllowedAssetIDs map[[32]byte]struct{}) (*types.Transaction, error) {
 	if deposit := tx.GetDeposit(); deposit != nil {
 		bridgeAddress := string(deposit.BridgeAddress.GetInner())
-		bac, ok := s.bridgeAddresses[bridgeAddress]
+		bac, ok := bridgeAddresses[bridgeAddress]
 		if !ok {
 			log.Debug("ignoring deposit tx from unknown bridge", "bridgeAddress", bridgeAddress)
 			return nil, fmt.Errorf("unknown bridge address: %s", bridgeAddress)
@@ -25,7 +26,7 @@ func (s *ExecutionServiceServerV1Alpha2) ValidateAndUnmarshalSequencerTx(tx *seq
 		}
 		assetID := [32]byte{}
 		copy(assetID[:], deposit.AssetId[:32])
-		if _, ok := s.bridgeAllowedAssetIDs[assetID]; !ok {
+		if _, ok := bridgeAllowedAssetIDs[assetID]; !ok {
 			log.Debug("ignoring deposit tx with disallowed asset ID", "assetID", deposit.AssetId)
 			return nil, fmt.Errorf("disallowed asset ID: %x", deposit.AssetId)
 		}

grpc/execution/validation_test.go

@@ -163,7 +163,7 @@ func TestSequenceTxValidation(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			_, err := serviceV1Alpha1.ValidateAndUnmarshalSequencerTx(test.sequencerTx)
+			_, err := ValidateAndUnmarshalSequencerTx(test.sequencerTx, serviceV1Alpha1.bridgeAddresses, serviceV1Alpha1.bridgeAllowedAssetIDs)
 			if test.wantErr != "" && err == nil {
 				t.Errorf("expected error, got nil")
 			}