Merge pull request #89 from valory-xyz/scripts

Fix requests count and scripts
valory-xyz · Jan 24, 2025 · 71ccca9 · 71ccca9
2 parents 47b6601 + 3752f7a
commit 71ccca9
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 14 deletions.
diff --git a/contracts/MechMarketplace.sol b/contracts/MechMarketplace.sol
@@ -51,7 +51,7 @@ struct RequestInfo {
 /// @author Andrey Lebedev - <[email protected]>
 /// @author Silvere Gangloff - <[email protected]>
 contract MechMarketplace is IErrorsMarketplace {
-    event CreateMech(address indexed mech, uint256 indexed serviceId);
+    event CreateMech(address indexed mech, uint256 indexed serviceId, address indexed mechFactory);
     event OwnerUpdated(address indexed owner);
     event ImplementationUpdated(address indexed implementation);
     event MarketplaceParamsUpdated(uint256 fee, uint256 minResponseTimeout, uint256 maxResponseTimeout);
@@ -440,6 +440,7 @@ contract MechMarketplace is IErrorsMarketplace {
             revert UnauthorizedAccount(mechFactory);
         }
 
+        // Create mech
         mech = IMechFactory(mechFactory).createMech(serviceRegistry, serviceId, payload);
 
         // This should never be the case
@@ -453,7 +454,7 @@ contract MechMarketplace is IErrorsMarketplace {
         mapServiceIdMech[serviceId] = mech;
         numMechs++;
 
-        emit CreateMech(mech, serviceId);
+        emit CreateMech(mech, serviceId, mechFactory);
     }
 
     /// @dev Sets mech factory statues.
@@ -755,12 +756,16 @@ contract MechMarketplace is IErrorsMarketplace {
         // Adjust requester nonce values
         mapNonces[requester] = nonce;
 
+        // Record the request count
+        mapRequestCounts[requester] += numRequests;
         // Increase the amount of requester delivered requests
-        mapDeliveryCounts[requester]++;
+        mapDeliveryCounts[requester] += numRequests;
         // Increase the amount of mech delivery counts
-        mapMechDeliveryCounts[msg.sender]++;
+        mapMechDeliveryCounts[msg.sender] += numRequests;
         // Increase the amount of mech service multisig delivered requests
-        mapMechServiceDeliveryCounts[mechServiceMultisig]++;
+        mapMechServiceDeliveryCounts[mechServiceMultisig] += numRequests;
+        // Increase the total number of requests
+        numTotalRequests += numRequests;
 
         // Increase mech requester karma
         IKarma(karma).changeRequesterMechKarma(requester, msg.sender, int256(numRequests));

diff --git a/...eployment/test/NvmSubscriptionTransfer.js → ...deployment/test/NvmSubscriptionBalance.js b/...eployment/test/NvmSubscriptionTransfer.js → ...deployment/test/NvmSubscriptionBalance.js
@@ -13,17 +13,14 @@ const main = async () => {
     const deployer = signers[0];
     console.log("Deployer:", deployer.address);
 
-    // Get requester balance
-    const subscription = await ethers.getContractAt("MockNvmSubscriptionNative", parsedData.subscriptionNFTAddress);
-    const subscriptionBalance = await subscription.balanceOf(deployer.address, parsedData.subscriptionTokenId);
-    console.log("subscriptionBalance", subscriptionBalance);
-
-    // Transfer to accounts
+    // Get requester balances
     const accounts = ["", ""];
-    const amounts = [100, 100];
-
+    const subscription = await ethers.getContractAt("MockNvmSubscriptionNative", parsedData.subscriptionNFTAddress);
     for (let i = 0; i < accounts.length; i++) {
-        await subscription.safeTransferFrom(deployer.address, accounts[i], parsedData.subscriptionTokenId, amounts[i], "0x");
+        const subscriptionBalance = await subscription.balanceOf(accounts[i], parsedData.subscriptionTokenId);
+        console.log("account:", accounts[i]);
+        console.log("subscriptionBalance:", subscriptionBalance);
+        //await subscription.safeTransferFrom(deployer.address, accounts[i], parsedData.subscriptionTokenId, amounts[i], "0x");
     }
 };
 

diff --git a/test/MechFixedPriceNative.js b/test/MechFixedPriceNative.js
@@ -492,6 +492,17 @@ describe("MechFixedPriceNative", function () {
             // Deliver a request
             await priorityMech.deliverToMarketplace([requestIds[0]], [data]);
 
+            let numRequestCounts = await mechMarketplace.mapRequestCounts(deployer.address);
+            expect(numRequestCounts).to.equal(1);
+            numRequestCounts = await mechMarketplace.mapDeliveryCounts(deployer.address);
+            expect(numRequestCounts).to.equal(1);
+            numRequestCounts = await mechMarketplace.mapMechDeliveryCounts(priorityMech.address);
+            expect(numRequestCounts).to.equal(1);
+            numRequestCounts = await mechMarketplace.mapMechServiceDeliveryCounts(deployer.address);
+            expect(numRequestCounts).to.equal(1);
+            numRequestCounts = await mechMarketplace.numTotalRequests();
+            expect(numRequestCounts).to.equal(1);
+
             // Check request Ids
             uRequestIds = await priorityMech.getUndeliveredRequestIds(0, 0);
             expect(uRequestIds.length).to.equal(0);
@@ -526,6 +537,18 @@ describe("MechFixedPriceNative", function () {
             // Deliver all requests
             await priorityMech.deliverToMarketplace(requestIds, datas);
 
+            // Check requests counts: first request plus a batch of numRequests requests
+            numRequestCounts = await mechMarketplace.mapRequestCounts(deployer.address);
+            expect(numRequestCounts).to.equal(numRequests + 1);
+            numRequestCounts = await mechMarketplace.mapDeliveryCounts(deployer.address);
+            expect(numRequestCounts).to.equal(numRequests + 1);
+            numRequestCounts = await mechMarketplace.mapMechDeliveryCounts(priorityMech.address);
+            expect(numRequestCounts).to.equal(numRequests + 1);
+            numRequestCounts = await mechMarketplace.mapMechServiceDeliveryCounts(deployer.address);
+            expect(numRequestCounts).to.equal(numRequests + 1);
+            numRequestCounts = await mechMarketplace.numTotalRequests();
+            expect(numRequestCounts).to.equal(numRequests + 1);
+
             // Check request Ids
             uRequestIds = await priorityMech.getUndeliveredRequestIds(0, 0);
             expect(uRequestIds.length).to.equal(0);
@@ -713,6 +736,18 @@ describe("MechFixedPriceNative", function () {
             // Deliver requests
             await priorityMech.deliverMarketplaceWithSignatures(deployer.address, datas, signatures, datas,
                 deliveryRates, "0x");
+
+            // Check requests counts
+            let numRequestCounts = await mechMarketplace.mapRequestCounts(deployer.address);
+            expect(numRequestCounts).to.equal(numRequests);
+            numRequestCounts = await mechMarketplace.mapDeliveryCounts(deployer.address);
+            expect(numRequestCounts).to.equal(numRequests);
+            numRequestCounts = await mechMarketplace.mapMechDeliveryCounts(priorityMech.address);
+            expect(numRequestCounts).to.equal(numRequests);
+            numRequestCounts = await mechMarketplace.mapMechServiceDeliveryCounts(deployer.address);
+            expect(numRequestCounts).to.equal(numRequests);
+            numRequestCounts = await mechMarketplace.numTotalRequests();
+            expect(numRequestCounts).to.equal(numRequests);
         });
 
         it("Requests with signatures for contracts", async function () {