feat(test-suite): add tests doing several requests in same block and tx (#36)

* feat(test-suite): add tests doing several requests in same block and tx

* chore(test-suite): update docker image for test suite

Author: jatZama

test-suite/e2e/contracts/TestAsyncDecrypt.sol

@@ -12,10 +12,14 @@ contract TestAsyncDecrypt is E2EFHEVMConfig  {
     euint8 xUint8;
     euint16 xUint16;
     euint32 xUint32;
+    euint32 xUint32_2;
+    euint32 xUint32_3;
     euint64 xUint64;
     euint64 xUint64_2;
     euint64 xUint64_3;
     euint128 xUint128;
+    euint128 xUint128_2;
+    euint128 xUint128_3;
     eaddress xAddress;
     eaddress xAddress2;
     euint256 xUint256;
@@ -25,10 +29,14 @@ contract TestAsyncDecrypt is E2EFHEVMConfig  {
     uint8 public yUint8;
     uint16 public yUint16;
     uint32 public yUint32;
+    uint32 public yUint32_2;
+    uint32 public yUint32_3;
     uint64 public yUint64;
     uint64 public yUint64_2;
     uint64 public yUint64_3;
     uint128 public yUint128;
+    uint128 public yUint128_2;
+    uint128 public yUint128_3;
     address public yAddress;
     address public yAddress2;
     uint256 public yUint256;
@@ -44,13 +52,16 @@ contract TestAsyncDecrypt is E2EFHEVMConfig  {
         /// @dev Initialize encrypted variables with sample values
         xBool = FHE.asEbool(true);
         FHE.allowThis(xBool);
-
         xUint8 = FHE.asEuint8(42);
         FHE.allowThis(xUint8);
         xUint16 = FHE.asEuint16(16);
         FHE.allowThis(xUint16);
         xUint32 = FHE.asEuint32(32);
         FHE.allowThis(xUint32);
+        xUint32_2 = FHE.asEuint32(1000);
+        FHE.allowThis(xUint32_2);
+        xUint32_3 = FHE.asEuint32(2000);
+        FHE.allowThis(xUint32_3);
         xUint64 = FHE.asEuint64(18446744073709551600);
         FHE.allowThis(xUint64);
         xUint64_2 = FHE.asEuint64(76575465786);
@@ -59,6 +70,10 @@ contract TestAsyncDecrypt is E2EFHEVMConfig  {
         FHE.allowThis(xUint64_3);
         xUint128 = FHE.asEuint128(1267650600228229401496703205443);
         FHE.allowThis(xUint128);
+        xUint128_2 = FHE.asEuint128(10000);
+        FHE.allowThis(xUint128_2);
+        xUint128_3 = FHE.asEuint128(20000);
+        FHE.allowThis(xUint128_3);
         xUint256 = FHE.asEuint256(27606985387162255149739023449108101809804435888681546220650096895197251);
         FHE.allowThis(xUint256);
         xAddress = FHE.asEaddress(0x8ba1f109551bD432803012645Ac136ddd64DBA72);
@@ -200,6 +215,38 @@ contract TestAsyncDecrypt is E2EFHEVMConfig  {
         }
     }
 
+    /// @notice Request decryption of a 32-bit unsigned integer
+    function requestUint32_2() public {
+        bytes32[] memory cts = new bytes32[](1);
+        cts[0] = FHE.toBytes32(xUint32_2);
+        FHE.requestDecryption(cts, this.callbackUint32_2.selector);
+    }
+
+    function callbackUint32_2(
+        uint256 requestID,
+        uint32 decryptedInput,
+        bytes[] memory signatures
+    ) public {
+        FHE.checkSignatures(requestID, signatures);
+        yUint32_2 = decryptedInput;
+    }
+
+    /// @notice Request decryption of a 32-bit unsigned integer
+    function requestUint32_3() public {
+        bytes32[] memory cts = new bytes32[](1);
+        cts[0] = FHE.toBytes32(xUint32_3);
+       FHE.requestDecryption(cts, this.callbackUint32_3.selector);
+    }
+
+        function callbackUint32_3(
+        uint256 requestID,
+        uint32 decryptedInput,
+        bytes[] memory signatures
+    ) public {
+        FHE.checkSignatures(requestID, signatures);
+        yUint32_3 = decryptedInput;
+    }
+
     /// @notice Request decryption of a 64-bit unsigned integer
     function requestUint64() public {
         bytes32[] memory cts = new bytes32[](1);
@@ -261,6 +308,33 @@ contract TestAsyncDecrypt is E2EFHEVMConfig  {
         return decryptedInput;
     }
 
+    function requestUint128_Many() public {
+        bytes32[] memory cts = new bytes32[](1);
+        cts[0] = FHE.toBytes32(xUint128_2);
+        FHE.requestDecryption(cts, this.callbackUint128_2.selector);
+        bytes32[] memory cts_2 = new bytes32[](1);
+        cts_2[0] = FHE.toBytes32(xUint128_3);
+        FHE.requestDecryption(cts_2, this.callbackUint128_3.selector);
+    }
+
+    function callbackUint128_2(
+        uint256 requestID,
+        uint128 decryptedInput,
+        bytes[] memory signatures
+    ) public {
+        FHE.checkSignatures(requestID, signatures);
+        yUint128_2 = decryptedInput;
+    }
+
+    function callbackUint128_3(
+        uint256 requestID,
+        uint128 decryptedInput,
+        bytes[] memory signatures
+    ) public {
+        FHE.checkSignatures(requestID, signatures);
+        yUint128_3 = decryptedInput;
+    }
+
     function requestUint256() public {
         bytes32[] memory cts = new bytes32[](1);
         cts[0] = FHE.toBytes32(xUint256);

test-suite/e2e/test/gatewayDecrypt/testAsyncDecrypt.ts

@@ -132,6 +132,31 @@ describe('TestAsyncDecrypt', function () {
     expect(y).to.equal(52); // 5+15+32
   });
 
+  it('test async decrypt uint32 - two requests in same block', async function () {
+    const pendingNonce = await ethers.provider.getTransactionCount(this.signers.alice.address, "pending");
+
+    const [txA, txB] = await Promise.all([
+      this.contract.requestUint32_2({
+        nonce: pendingNonce,
+      }),
+      this.contract.requestUint32_3({
+        nonce: pendingNonce+1,
+      }),
+    ]);
+
+    const [receiptA, receiptB] = await Promise.all([txA.wait(), txB.wait()]);
+
+    console.log("txA block:", receiptA.blockNumber);
+    console.log("txB block:", receiptB.blockNumber);
+
+    await awaitAllDecryptionResults();
+
+    const y2 = await this.contract.yUint32_2();
+    expect(y2).to.equal(1000);
+    const y3 = await this.contract.yUint32_3();
+    expect(y3).to.equal(2000);
+  });
+
   it.skip('test async decrypt FAKE uint32', async function () {
     if (network.name !== 'hardhat') {
       // only in fhevm mode
@@ -167,6 +192,16 @@ describe('TestAsyncDecrypt', function () {
     expect(y).to.equal(1267650600228229401496703205443n);
   });
 
+  it('test async decrypt uint128 - two requests in same tx', async function () {
+    const tx2 = await this.contract.connect(this.signers.carol).requestUint128_Many();
+    await tx2.wait();
+    await awaitAllDecryptionResults();
+    const y2 = await this.contract.yUint128_2();
+    expect(y2).to.equal(10000n);
+    const y3 = await this.contract.yUint128_3();
+    expect(y3).to.equal(20000n);
+  });
+
   it('test async decrypt uint128 non-trivial', async function () {
     const inputAlice = this.instances.alice.createEncryptedInput(this.contractAddress, this.signers.alice.address);
     inputAlice.add128(184467440737095500429401496n);

test-suite/fhevm/fhevm-cli

@@ -24,7 +24,7 @@ export DB_MIGRATION_VERSION=${DB_MIGRATION_VERSION:-"v0.7.0-rc8"}
 export HOST_VERSION=${HOST_VERSION:-"31c51c3"}
 export GATEWAY_VERSION=${GATEWAY_VERSION:-"5d13e72"}
 export RELAYER_VERSION=${RELAYER_VERSION:-"v0.1.0-rc8"}
-export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"0d61373"}
+export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"76b0e4f"}
 
 function print_logo() {
   echo -e "${LIGHT_BLUE}"