Add tx nonce

sergerad · Aug 30, 2024 · 034132c · 034132c
1 parent a3bde1f
commit 034132c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/rollup/src/sequencer.rs b/rollup/src/sequencer.rs
@@ -132,7 +132,7 @@ mod tests {
 
         // Add a transaction to the sequencer.
         let transaction = SignedTransaction::new(
-            Transaction::dynamic(sequencer.signer.address, 100),
+            Transaction::dynamic(sequencer.signer.address, 100, 1),
             &sequencer.signer,
         );
         sequencer.add_transaction(transaction.clone());

diff --git a/rollup/src/transaction.rs b/rollup/src/transaction.rs
@@ -16,6 +16,8 @@ pub struct TransactionHeader {
     recipient: Address,
     /// The amount of value transferred by the transaction.
     amount: u64,
+    /// The nonce of the transaction.
+    nonce: u64,
 }
 
 /// A dynamic transaction containing a transaction header and dynamic fee data.
@@ -65,26 +67,28 @@ pub enum Transaction {
 
 impl Transaction {
     /// Creates a new dynamic transaction.
-    pub fn dynamic(sender: Address, amount: u64) -> Self {
+    pub fn dynamic(sender: Address, amount: u64, nonce: u64) -> Self {
         Transaction::Dynamic(DynamicTxData {
             header: TransactionHeader {
                 chain_id: CHAIN_ID,
                 sender,
-                recipient: Address::random(),
                 amount,
+                recipient: Address::random(),
+                nonce,
             },
             max_fee_per_gas: 0,
             max_priority_fee_per_gas: 0,
         })
     }
 
     /// Creates a new withdrawal transaction.
-    pub fn withdrawal(sender: Address, amount: u64, dest_chain: u64) -> Self {
+    pub fn withdrawal(sender: Address, amount: u64, nonce: u64, dest_chain: u64) -> Self {
         Transaction::Withdrawal(WithdrawalTxData {
             header: TransactionHeader {
                 chain_id: CHAIN_ID,
                 sender,
                 recipient: sender,
+                nonce,
                 amount,
             },
             dest_chain,
@@ -146,12 +150,12 @@ mod tests {
     fn test_transaction() {
         // Create a dynamic transaction and verify.
         let signer = Signer::random();
-        let tx = Transaction::dynamic(signer.address, 100);
+        let tx = Transaction::dynamic(signer.address, 100, 1);
         let tx = SignedTransaction::new(tx.clone(), &signer);
         assert!(tx.verify());
 
         // Create a withdrawal transaction and verify.
-        let tx = Transaction::withdrawal(signer.address, 100, 1);
+        let tx = Transaction::withdrawal(signer.address, 100, 1, 2);
         let tx = SignedTransaction::new(tx.clone(), &signer);
         assert!(tx.verify());
     }

diff --git a/script/src/main.rs b/script/src/main.rs
@@ -48,7 +48,7 @@ async fn tx_loop() {
     for i in 0.. {
         // Send a deposit transaction.
         let signer = Signer::random();
-        let transaction = Transaction::dynamic(signer.address, i);
+        let transaction = Transaction::dynamic(signer.address, i, i);
         let signed = SignedTransaction::new(transaction, &signer);
         if let Err(e) = send_transaction(signed).await {
             handle_request_err(e).await;
@@ -57,7 +57,7 @@ async fn tx_loop() {
 
         // Send a withdrawal transaction.
         let dest_chain = 1u64;
-        let transaction = Transaction::withdrawal(signer.address, i, dest_chain);
+        let transaction = Transaction::withdrawal(signer.address, i, dest_chain, i);
         let signed = SignedTransaction::new(transaction, &signer);
         if let Err(e) = send_transaction(signed).await {
             handle_request_err(e).await;