From 089f58886708af8387a42d581ecf71c037bbb95b Mon Sep 17 00:00:00 2001 From: ethanoroshiba Date: Tue, 10 Sep 2024 08:34:35 -0500 Subject: [PATCH] Fix a couple missed name changes --- core/types/deposit_tx.go | 8 ++++---- grpc/execution/validation.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/types/deposit_tx.go b/core/types/deposit_tx.go index 37ca3b09e..6b0e60ecc 100644 --- a/core/types/deposit_tx.go +++ b/core/types/deposit_tx.go @@ -27,9 +27,9 @@ type DepositTx struct { Data []byte // the transaction ID of the source action for the deposit, consisting // of the transaction hash. - IdOfSourceTransaction primitivev1.TransactionId + SourceTransactionId primitivev1.TransactionId // index of the deposit's source action within its transaction - PositionInSourceTransaction uint64 + SourceTransactionIndex uint64 } func (tx *DepositTx) copy() TxData { @@ -44,8 +44,8 @@ func (tx *DepositTx) copy() TxData { Gas: tx.Gas, To: to, Data: make([]byte, len(tx.Data)), - IdOfSourceTransaction: tx.IdOfSourceTransaction, - PositionInSourceTransaction: tx.PositionInSourceTransaction, + SourceTransactionId: tx.SourceTransactionId, + SourceTransactionIndex: tx.SourceTransactionIndex, } if tx.Value != nil { diff --git a/grpc/execution/validation.go b/grpc/execution/validation.go index fa2fba0f1..092900507 100644 --- a/grpc/execution/validation.go +++ b/grpc/execution/validation.go @@ -70,8 +70,8 @@ func validateAndUnmarshalSequencerTx( Gas: 16000, To: &bac.Erc20Asset.ContractAddress, Data: calldata, - IdOfSourceTransaction: *deposit.SourceTransactionId, - PositionInSourceTransaction: deposit.SourceActionIndex, + SourceTransactionId: *deposit.SourceTransactionId, + SourceTransactionIndex: deposit.SourceActionIndex, } tx := types.NewTx(&txdata) @@ -83,8 +83,8 @@ func validateAndUnmarshalSequencerTx( To: &recipient, Value: amount, Gas: 0, - IdOfSourceTransaction: *deposit.SourceTransactionId, - PositionInSourceTransaction: deposit.SourceActionIndex, + SourceTransactionId: *deposit.SourceTransactionId, + SourceTransactionIndex: deposit.SourceActionIndex, } return types.NewTx(&txdata), nil } else {