Merge pull request #11 from ElrondNetwork/leftover-funds-fix

leftover funds fix
multiversx · Mar 22, 2022 · 2361ab0 · 2361ab0
2 parents 1d59637 + 6d7df88
commit 2361ab0
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 1 deletion.
diff --git a/metabonding/mandos/clear_project_funds_not_deposited.scen.json b/metabonding/mandos/clear_project_funds_not_deposited.scen.json
@@ -0,0 +1,92 @@
+{
+    "steps": [
+        {
+            "step": "externalSteps",
+            "path": "init.scen.json"
+        },
+        {
+            "step": "scCall",
+            "txId": "add-first-project",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:meta",
+                "function": "addProject",
+                "arguments": [
+                    "str:FirstProj",
+                    "address:project_owner1",
+                    "str:PROJ-123456",
+                    "1,000,000,000",
+                    "1",
+                    "3",
+                    "0"
+                ],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scQuery",
+            "txId": "get-all-project-ids-before",
+            "tx": {
+                "to": "sc:meta",
+                "function": "getAllProjectIds",
+                "arguments": []
+            },
+            "expect": {
+                "out": [
+                    "str:FirstProj"
+                ],
+                "status": "0",
+                "logs": "*"
+            }
+        },
+        {
+            "step": "setState",
+            "currentBlockInfo": {
+                "blockEpoch": "100"
+            }
+        },
+        {
+            "step": "scCall",
+            "txId": "clear-expired-projects",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:meta",
+                "function": "clearExpiredProjects",
+                "arguments": [],
+                "gasLimit": "10,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "str:completed"
+                ],
+                "status": "0",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scQuery",
+            "txId": "get-all-project-ids-after",
+            "tx": {
+                "to": "sc:meta",
+                "function": "getAllProjectIds",
+                "arguments": []
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "logs": "*"
+            }
+        }
+    ]
+}
diff --git a/metabonding/src/project.rs b/metabonding/src/project.rs
@@ -90,7 +90,6 @@ pub trait ProjectModule: crate::common_storage::CommonStorageModule {
         );
 
         self.project_owner(&project_id).set(&project_owner);
-        self.leftover_project_funds(&project_id).set(&reward_supply);
 
         let lkmex_reward_supply = &reward_supply * lkmex_rewards_percentage / MAX_PERCENTAGE;
         let delegation_reward_supply = &reward_supply - &lkmex_reward_supply;

diff --git a/metabonding/src/rewards.rs b/metabonding/src/rewards.rs
@@ -94,6 +94,8 @@ pub trait RewardsModule:
         );
         require!(total_reward_supply == payment_amount, "Invalid amount");
 
+        self.leftover_project_funds(&project_id)
+            .set(&total_reward_supply);
         self.rewards_deposited(&project_id).set(&true);
     }