add tx index per eon

shutter-network · Jun 21, 2024 · af9c9c7 · af9c9c7
1 parent 4e3d522
commit af9c9c7
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 20 deletions.
diff --git a/gnoshcontracts/sequencer/sequencer.go b/gnoshcontracts/sequencer/sequencer.go
diff --git a/src/ISequencer.sol b/src/ISequencer.sol
@@ -14,7 +14,8 @@ interface ISequencer {
     function submitDecryptionProgress(bytes memory message) external;
 
     event TransactionSubmitted(
-        uint64 eon,
+        uint64 indexed eon,
+        uint64 indexed txIndex,
         bytes32 identityPrefix,
         address sender,
         bytes encryptedTransaction,

diff --git a/src/Sequencer.sol b/src/Sequencer.sol
@@ -4,6 +4,9 @@ pragma solidity ^0.8.20;
 import "src/ISequencer.sol";
 
 contract Sequencer is ISequencer {
+
+    mapping(uint64 eon => uint64 txCount) private txCounters;
+
     function submitEncryptedTransaction(
         uint64 eon,
         bytes32 identityPrefix,
@@ -14,16 +17,25 @@ contract Sequencer is ISequencer {
             revert InsufficientFee();
         }
 
+        uint64 index = txCounters[eon];
+        txCounters[eon] = index + 1;
+
         emit TransactionSubmitted(
             eon,
+            index,
             identityPrefix,
             msg.sender,
             encryptedTransaction,
             gasLimit
         );
+
     }
 
     function submitDecryptionProgress(bytes memory message) external {
         emit DecryptionProgressSubmitted(message);
     }
+
+    function getTxCountForEon(uint64 eon) external view returns (uint64) {
+        return txCounters[eon];
+    }
 }
diff --git a/test/Sequencer.t.sol b/test/Sequencer.t.sol
@@ -8,13 +8,6 @@ import "../src/Sequencer.sol";
 contract SequencerTest is Test {
     Sequencer public sequencer;
 
-    event TransactionSubmitted(
-        uint64 eon,
-        bytes32 identityPrefix,
-        address sender,
-        bytes encryptedTransaction,
-        uint256 gasLimit
-    );
     event DecryptionProgressSubmitted(bytes message);
 
     function setUp() public {
@@ -23,14 +16,16 @@ contract SequencerTest is Test {
 
     function testSubmitTransaction() public {
         uint64 eon = 5;
+        uint64 txIndex = 0;
         bytes32 identityPrefix = hex"001122";
         address sender = makeAddr("sender");
         bytes memory encryptedTransaction = "aabbcc";
         uint256 gasLimit = 8;
 
         vm.expectEmit(address(sequencer));
-        emit TransactionSubmitted(
+        emit ISequencer.TransactionSubmitted(
             eon,
+            txIndex,
             identityPrefix,
             sender,
             encryptedTransaction,
@@ -72,4 +67,32 @@ contract SequencerTest is Test {
         emit DecryptionProgressSubmitted(message);
         sequencer.submitDecryptionProgress(message);
     }
+
+    function testTxCount() public {
+        uint64 eon = 5;
+        bytes32 identityPrefix = hex"001122";
+        address sender = makeAddr("sender");
+        bytes memory encryptedTransaction = "aabbcc";
+        uint256 gasLimit = 8;
+
+        assertEqUint(sequencer.getTxCountForEon(eon), 0);
+        vm.fee(20);
+        hoax(sender);
+        sequencer.submitEncryptedTransaction{value: 160}(
+            eon,
+            identityPrefix,
+            encryptedTransaction,
+            gasLimit
+        );
+        assertEqUint(sequencer.getTxCountForEon(eon), 1);
+        assertEqUint(sequencer.getTxCountForEon(eon+1), 0);
+        sequencer.submitEncryptedTransaction{value: 160}(
+            eon+1,
+            identityPrefix,
+            encryptedTransaction,
+            gasLimit
+        );
+        assertEqUint(sequencer.getTxCountForEon(eon), 1);
+        assertEqUint(sequencer.getTxCountForEon(eon+1), 1);
+    }
 }