chore(gateway-contracts): rename counterShares to indexShare and make it start at 0

Author: melanciani

gateway-contracts/contracts/Decryption.sol

@@ -549,7 +549,15 @@ contract Decryption is
         txSenderAddresses.push(msg.sender);
 
         // Store the user decrypted share for the user decryption response.
-        emit UserDecryptionResponse(decryptionId, txSenderAddresses.length, userDecryptedShare, signature, extraData);
+        // The index of the share is the length of the txSenderAddresses - 1 so that the first response
+        // associated to this decryptionId has an index of 0.
+        emit UserDecryptionResponse(
+            decryptionId,
+            txSenderAddresses.length - 1,
+            userDecryptedShare,
+            signature,
+            extraData
+        );
 
         // Send the event if and only if the consensus is reached in the current response call.
         // This means a "late" response will not be reverted, just ignored and no event will be emitted

gateway-contracts/contracts/interfaces/IDecryption.sol

@@ -78,14 +78,14 @@ interface IDecryption {
     /**
      * @notice Emitted when an public decryption response is made.
      * @param decryptionId The decryption request ID associated with the response.
-     * @param counterShares The counter of shares associated with the response.
-     * @param userDecryptedShare The of decryption share reencrypted with the user's public key.
+     * @param indexShare The index of the share associated with the decryption.
+     * @param userDecryptedShare The decryption share reencrypted with the user's public key.
      * @param signature The signature of the KMS connector that responded.
      * @param extraData Generic bytes metadata for versioned payloads. First byte is for the version.
      */
     event UserDecryptionResponse(
         uint256 indexed decryptionId,
-        uint256 counterShares,
+        uint256 indexShare,
         bytes userDecryptedShare,
         bytes signature,
         bytes extraData

gateway-contracts/contracts/mocks/DecryptionMock.sol

@@ -36,7 +36,7 @@ contract DecryptionMock {
 
     event UserDecryptionResponse(
         uint256 indexed decryptionId,
-        uint256 counterShares,
+        uint256 indexShare,
         bytes userDecryptedShare,
         bytes signature,
         bytes extraData
@@ -104,9 +104,9 @@ contract DecryptionMock {
         bytes calldata signature,
         bytes calldata extraData
     ) external {
-        uint256 counterShares;
+        uint256 indexShare;
 
-        emit UserDecryptionResponse(decryptionId, counterShares, userDecryptedShare, signature, extraData);
+        emit UserDecryptionResponse(decryptionId, indexShare, userDecryptedShare, signature, extraData);
 
         emit UserDecryptionResponseThresholdReached(decryptionId);
     }

gateway-contracts/rust_bindings/src/decryption.rs

@@ -47,7 +47,7 @@ interface IDecryption {
     event PublicDecryptionRequest(uint256 indexed decryptionId, SnsCiphertextMaterial[] snsCtMaterials, bytes extraData);
     event PublicDecryptionResponse(uint256 indexed decryptionId, bytes decryptedResult, bytes[] signatures, bytes extraData);
     event UserDecryptionRequest(uint256 indexed decryptionId, SnsCiphertextMaterial[] snsCtMaterials, address userAddress, bytes publicKey, bytes extraData);
-    event UserDecryptionResponse(uint256 indexed decryptionId, uint256 counterShares, bytes userDecryptedShare, bytes signature, bytes extraData);
+    event UserDecryptionResponse(uint256 indexed decryptionId, uint256 indexShare, bytes userDecryptedShare, bytes signature, bytes extraData);
     event UserDecryptionResponseThresholdReached(uint256 indexed decryptionId);
 
     function checkDecryptionDone(uint256 decryptionId) external view;
@@ -614,7 +614,7 @@ interface IDecryption {
         "internalType": "uint256"
       },
       {
-        "name": "counterShares",
+        "name": "indexShare",
         "type": "uint256",
         "indexed": false,
         "internalType": "uint256"
@@ -4046,7 +4046,7 @@ event UserDecryptionRequest(uint256 indexed decryptionId, SnsCiphertextMaterial[
     #[derive(Default, Debug, PartialEq, Eq, Hash)]
     /**Event with signature `UserDecryptionResponse(uint256,uint256,bytes,bytes,bytes)` and selector `0x7fcdfb5381917f554a717d0a5470a33f5a49ba6445f05ec43c74c0bc2cc608b2`.
 ```solidity
-event UserDecryptionResponse(uint256 indexed decryptionId, uint256 counterShares, bytes userDecryptedShare, bytes signature, bytes extraData);
+event UserDecryptionResponse(uint256 indexed decryptionId, uint256 indexShare, bytes userDecryptedShare, bytes signature, bytes extraData);
 ```*/
     #[allow(
         non_camel_case_types,
@@ -4059,7 +4059,7 @@ event UserDecryptionResponse(uint256 indexed decryptionId, uint256 counterShares
         #[allow(missing_docs)]
         pub decryptionId: alloy::sol_types::private::primitives::aliases::U256,
         #[allow(missing_docs)]
-        pub counterShares: alloy::sol_types::private::primitives::aliases::U256,
+        pub indexShare: alloy::sol_types::private::primitives::aliases::U256,
         #[allow(missing_docs)]
         pub userDecryptedShare: alloy::sol_types::private::Bytes,
         #[allow(missing_docs)]
@@ -4105,7 +4105,7 @@ event UserDecryptionResponse(uint256 indexed decryptionId, uint256 counterShares
             ) -> Self {
                 Self {
                     decryptionId: topics.1,
-                    counterShares: data.0,
+                    indexShare: data.0,
                     userDecryptedShare: data.1,
                     signature: data.2,
                     extraData: data.3,
@@ -4131,7 +4131,7 @@ event UserDecryptionResponse(uint256 indexed decryptionId, uint256 counterShares
                 (
                     <alloy::sol_types::sol_data::Uint<
                         256,
-                    > as alloy_sol_types::SolType>::tokenize(&self.counterShares),
+                    > as alloy_sol_types::SolType>::tokenize(&self.indexShare),
                     <alloy::sol_types::sol_data::Bytes as alloy_sol_types::SolType>::tokenize(
                         &self.userDecryptedShare,
                     ),

gateway-contracts/rust_bindings/src/i_decryption.rs

@@ -1431,13 +1431,13 @@ describe("Decryption", function () {
       // Check UserDecryptionResponse events are emitted for each response
       await expect(responseTx1)
         .to.emit(decryption, "UserDecryptionResponse")
-        .withArgs(decryptionId, 1, userDecryptedShares[0], kmsSignatures[0], extraDataV0);
+        .withArgs(decryptionId, 0n, userDecryptedShares[0], kmsSignatures[0], extraDataV0);
       await expect(responseTx2)
         .to.emit(decryption, "UserDecryptionResponse")
-        .withArgs(decryptionId, 2, userDecryptedShares[1], kmsSignatures[1], extraDataV0);
+        .withArgs(decryptionId, 1n, userDecryptedShares[1], kmsSignatures[1], extraDataV0);
       await expect(responseTx3)
         .to.emit(decryption, "UserDecryptionResponse")
-        .withArgs(decryptionId, 3, userDecryptedShares[2], kmsSignatures[2], extraDataV0);
+        .withArgs(decryptionId, 2n, userDecryptedShares[2], kmsSignatures[2], extraDataV0);
 
       // Threshold should be reached at the third response (reconstruction threshold)
       // Check 3rd response event: it should emit the threshold reached event
@@ -2265,13 +2265,13 @@ describe("Decryption", function () {
       // Check UserDecryptionResponse events are emitted for each response
       await expect(responseTx1)
         .to.emit(decryption, "UserDecryptionResponse")
-        .withArgs(decryptionId, 1, userDecryptedShares[0], kmsSignatures[0], extraDataV0);
+        .withArgs(decryptionId, 0n, userDecryptedShares[0], kmsSignatures[0], extraDataV0);
       await expect(responseTx2)
         .to.emit(decryption, "UserDecryptionResponse")
-        .withArgs(decryptionId, 2, userDecryptedShares[1], kmsSignatures[1], extraDataV0);
+        .withArgs(decryptionId, 1n, userDecryptedShares[1], kmsSignatures[1], extraDataV0);
       await expect(responseTx3)
         .to.emit(decryption, "UserDecryptionResponse")
-        .withArgs(decryptionId, 3, userDecryptedShares[2], kmsSignatures[2], extraDataV0);
+        .withArgs(decryptionId, 2n, userDecryptedShares[2], kmsSignatures[2], extraDataV0);
 
       // Threshold should be reached at the third response (reconstruction threshold)
       // Check 3rd response event: it should emit the threshold reached event