Fix grant disbursement bugs and add grant disbursement tests

Author: evanmarshall

grant_disbursement/build/main.aleo

@@ -72,7 +72,7 @@ function process_grant:
     input r0 as u8.private;
     input r1 as u64.private;
     input r2 as u128.private;
-    call credits.aleo/transfer_public self.caller r1 into r3;
+    call credits.aleo/transfer_public self.signer r1 into r3;
     cast r2 into r4 as u64;
     call pondo_protocol.aleo/deposit_public_as_signer r1 r4 grant_disbursement.aleo into r5;
     call token_registry.aleo/transfer_public_as_signer 1751493913335802797273486270793650302076377624243810059080883537084141842600field grant_disbursement.aleo r2 into r6;
@@ -95,7 +95,7 @@ finalize process_grant:
     add r6.supply r8 into r9;
     sub r9 r5 into r10;
     get pondo_protocol.aleo/balances[0u8] into r11;
-    get.or_use credits.aleo/account[grant_disbursement.aleo] 0u64 into r12;
+    get.or_use credits.aleo/account[pondo_protocol.aleo] 0u64 into r12;
     get pondo_protocol.aleo/balances[2u8] into r13;
     add r11 r12 into r14;
     sub r14 r13 into r15;
@@ -104,8 +104,8 @@ finalize process_grant:
     mul r17 r10 into r18;
     cast r16 into r19 as u128;
     div r18 r19 into r20;
-    mul r20 9_999u128 into r21;
-    div r21 10_000u128 into r22;
+    mul r20 999u128 into r21;
+    div r21 1_000u128 into r22;
     gte r5 r22 into r23;
     assert.eq r23 true;
     get grants[r3] into r24;
@@ -136,14 +136,14 @@ finalize withdraw_rewards:
     assert.eq r6 true;
     sub r4.paleo_amount r2 into r7;
     get pondo_protocol.aleo/protocol_state[0u8] into r8;
-    is.neq r8 1u8 into r9;
+    is.neq r8 2u8 into r9;
     assert.eq r9 true;
     get token_registry.aleo/registered_tokens[1751493913335802797273486270793650302076377624243810059080883537084141842600field] into r10;
     get pondo_protocol.aleo/owed_commission[0u8] into r11;
     cast r11 into r12 as u128;
     add r10.supply r12 into r13;
     get pondo_protocol.aleo/balances[0u8] into r14;
-    get.or_use credits.aleo/account[grant_disbursement.aleo] 0u64 into r15;
+    get.or_use credits.aleo/account[pondo_protocol.aleo] 0u64 into r15;
     get pondo_protocol.aleo/balances[2u8] into r16;
     add r14 r15 into r17;
     sub r17 r16 into r18;
@@ -179,14 +179,14 @@ finalize withdraw_principal:
     assert.eq r6 true;
     sub r4.paleo_amount r2 into r7;
     get pondo_protocol.aleo/protocol_state[0u8] into r8;
-    is.neq r8 1u8 into r9;
+    is.neq r8 2u8 into r9;
     assert.eq r9 true;
     get token_registry.aleo/registered_tokens[1751493913335802797273486270793650302076377624243810059080883537084141842600field] into r10;
     get pondo_protocol.aleo/owed_commission[0u8] into r11;
     cast r11 into r12 as u128;
     add r10.supply r12 into r13;
     get pondo_protocol.aleo/balances[0u8] into r14;
-    get.or_use credits.aleo/account[grant_disbursement.aleo] 0u64 into r15;
+    get.or_use credits.aleo/account[pondo_protocol.aleo] 0u64 into r15;
     get pondo_protocol.aleo/balances[2u8] into r16;
     add r14 r15 into r17;
     sub r17 r16 into r18;

grant_disbursement/src/main.leo

@@ -12,8 +12,8 @@ program grant_disbursement.aleo {
   const CLIFF_TIMESTAMP: u64 = 1_000_000_000u64;
   const FULLY_VESTED_TIMESTAMP: u64 = 2_000_000_000u64;
 
-  const PALEO_TOLERANCE: u128 = 9_999u128;
-  const PALEO_PRECISION: u128 = 10_000u128;
+  const PALEO_TOLERANCE: u128 = 999u128;
+  const PALEO_PRECISION: u128 = 1_000u128;
 
   struct Grant {
     credits_amount: u64, // The amount of Aleo credits to be distributed
@@ -57,7 +57,7 @@ program grant_disbursement.aleo {
     paleo_amount: u128,
   ) -> Future {
     // Transfer the credits to signer temporarily to deposit into the pondo core protocol
-    let f0: Future = credits.aleo/transfer_public(self.caller, credits_amount);
+    let f0: Future = credits.aleo/transfer_public(self.signer, credits_amount);
     // Deposit the credits into the pondo core protocol
     let f1: Future = pondo_protocol.aleo/deposit_public_as_signer(credits_amount, paleo_amount as u64, self.address);
     // Transfer the pAleo to the grant disbursement program
@@ -87,7 +87,7 @@ program grant_disbursement.aleo {
 
     // Calculate the total credits
     let delegated_credits: u64 = pondo_protocol.aleo/balances.get(DELEGATED_BALANCE);
-    let core_protocol_account: u64 = credits.aleo/account.get_or_use(self.address, 0u64);
+    let core_protocol_account: u64 = credits.aleo/account.get_or_use(pondo_protocol.aleo, 0u64);
     let reserved_for_withdrawal: u64 = pondo_protocol.aleo/balances.get(CLAIMABLE_WITHDRAWALS);
     let total_credits_pool: u64 = delegated_credits + core_protocol_account - reserved_for_withdrawal - credits_amount;
 
@@ -164,7 +164,7 @@ program grant_disbursement.aleo {
     let paleo_commission: u64 = pondo_protocol.aleo/owed_commission.get(0u8);
     let total_paleo_pool: u128 = minted_paleo + paleo_commission as u128;
     let delegated_credits: u64 = pondo_protocol.aleo/balances.get(DELEGATED_BALANCE);
-    let core_protocol_account: u64 = credits.aleo/account.get_or_use(self.address, 0u64);
+    let core_protocol_account: u64 = credits.aleo/account.get_or_use(pondo_protocol.aleo, 0u64);
     let reserved_for_withdrawal: u64 = pondo_protocol.aleo/balances.get(CLAIMABLE_WITHDRAWALS);
     let total_credits_pool: u64 = delegated_credits + core_protocol_account - reserved_for_withdrawal;
 
@@ -229,7 +229,7 @@ program grant_disbursement.aleo {
     let paleo_commission: u64 = pondo_protocol.aleo/owed_commission.get(0u8);
     let total_paleo_pool: u128 = minted_paleo + paleo_commission as u128;
     let delegated_credits: u64 = pondo_protocol.aleo/balances.get(DELEGATED_BALANCE);
-    let core_protocol_account: u64 = credits.aleo/account.get_or_use(self.address, 0u64);
+    let core_protocol_account: u64 = credits.aleo/account.get_or_use(pondo_protocol.aleo, 0u64);
     let reserved_for_withdrawal: u64 = pondo_protocol.aleo/balances.get(CLAIMABLE_WITHDRAWALS);
     let total_credits_pool: u64 = delegated_credits + core_protocol_account - reserved_for_withdrawal;
 
@@ -260,7 +260,7 @@ program grant_disbursement.aleo {
   const PALEO_TOKEN_ID: field = 1751493913335802797273486270793650302076377624243810059080883537084141842600field;
   // Copied from pondo_protocol.aleo
   const PROTOCOL_STATE_KEY: u8 = 0u8;
-  const REBALANCING_STATE: u8 = 1u8;
+  const REBALANCING_STATE: u8 = 2u8;
   const DELEGATED_BALANCE: u8 = 0u8;
   const CLAIMABLE_WITHDRAWALS: u8 = 2u8;