update

flyindirty · May 24, 2023 · e57228b · e57228b
1 parent dab7f76
commit e57228b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/darc-protocol/contracts/Runtime/Executable/Instructions/MoneyInstructions.sol b/darc-protocol/contracts/Runtime/Executable/Instructions/MoneyInstructions.sol
@@ -92,9 +92,14 @@ contract MoneyInstructions is MachineStateManager {
   function op_OFFER_DIVIDENDS(Operation memory operation, bool bIsSandbox) internal {
     if (bIsSandbox) {
 
+      // make sure that the dividend per myriad per transaction is less than 1000
       require(sandboxMachineState.machineStateParameters.dividendPermyriadPerTransaction < 1000, 
         ErrorMsg.By(15));
 
+      // make sure that cycle counter is less than the threashold
+      require(sandboxMachineState.machineStateParameters.dividendCycleCounter < 
+        sandboxMachineState.machineStateParameters.dividendCycleOfTransactions, ErrorMsg.By(16));
+
       // 1. calculate the total amount of dividends to be offered
       bool bIsValid = true;
       uint256 totalDividends = 0;
@@ -238,9 +243,14 @@ contract MoneyInstructions is MachineStateManager {
       sandboxMachineState.machineStateParameters.dividendCycleCounter = 0;
     }
     else {
+      // make sure that the dividend per myriad per transaction is less than 1000
       require(currentMachineState.machineStateParameters.dividendPermyriadPerTransaction < 1000, 
         ErrorMsg.By(15));
 
+      // make sure that cycle counter is less than the threashold
+      require(currentMachineState.machineStateParameters.dividendCycleCounter < 
+        currentMachineState.machineStateParameters.dividendCycleOfTransactions, ErrorMsg.By(16));
+
       // 1. calculate the total amount of dividends to be offered
       bool bIsValid = true;
       uint256 totalDividends = 0;

diff --git a/darc-protocol/contracts/Utilities/ErrorMsg.sol b/darc-protocol/contracts/Utilities/ErrorMsg.sol
@@ -43,6 +43,9 @@ library ErrorMsg{
     else if (val == 15) {
       return "Invalid dividend permyriad per transaction. Should be less than 1000";
     }
+    else if (val == 16) {
+      return "No enough number of transactions for dividends yet";
+    }
     return "Unknown Error";
   }
 }
diff --git a/darc-protocol/test/operationUnitTest/offer_dividends_test.ts b/darc-protocol/test/operationUnitTest/offer_dividends_test.ts
@@ -34,7 +34,7 @@ describe("offer_dividends_test", function () {
     await darc.initialize();
 
 
-    // create a token class first
+    // create 3 token class first
     await darc.entrance({
       programOperatorAddress: programOperatorAddress,
       operations: [{
@@ -49,8 +49,8 @@ describe("offer_dividends_test", function () {
           PARAMETER_ARRAY: [],
           PLUGIN_ARRAY: [],
           UINT256_2DARRAY: [
-            [BigNumber.from(0), BigNumber.from(1)],
-            [BigNumber.from(10), BigNumber.from(1)],
+            [BigNumber.from(1), BigNumber.from(1)],
+            [BigNumber.from(1), BigNumber.from(10)],
             [BigNumber.from(10), BigNumber.from(1)],
           ],
           ADDRESS_2DARRAY: []