fix lockup indexing

Author: BeginArtem

ft-lockup-contract/src/lib.rs

@@ -107,7 +107,7 @@ impl Contract {
 
 impl Contract {
     pub fn next_index(&mut self) -> LockupIndex {
-        while self.lockups.keys().any(|key| key == self.index) {
+        if self.lockups.get(&self.index).is_some() {
             self.index = self
                 .index
                 .checked_add(1)

ft-token-contract/src/lis_token.rs

@@ -104,12 +104,13 @@ mod tests {
     fn mint_time_check() {
         let owner_id = accounts(0);
         let staking_id = accounts(1);
+        let lockup_id = accounts(2);
         let initial_total_supply = 3_000_000_000 * 10_u128.pow(12);
         let context = VMContextBuilder::new();
 
         // init contract
         testing_env!(context.clone().block_timestamp(WEEK.0).build());
-        let mut contract = Contract::new(Some(owner_id.clone()), None, staking_id);
+        let mut contract = Contract::new(Some(owner_id.clone()), None, staking_id, lockup_id);
         assert_eq!(contract.ft_total_supply().0, initial_total_supply);
 
         // wait week
@@ -170,12 +171,13 @@ mod tests {
     fn mint_before_new_week() {
         let owner_id = accounts(0);
         let staking_id = accounts(1);
+        let lockup_id = accounts(2);
         let initial_total_supply = 3_000_000_000 * 10_u128.pow(12);
         let context = VMContextBuilder::new();
 
         // init contract
         testing_env!(context.clone().block_timestamp(WEEK.0).build());
-        let mut contract = Contract::new(Some(owner_id.clone()), None, staking_id);
+        let mut contract = Contract::new(Some(owner_id.clone()), None, staking_id, lockup_id);
         assert_eq!(contract.ft_total_supply().0, initial_total_supply);
 
         // wait 3 days
@@ -193,11 +195,12 @@ mod tests {
     fn can_mint_only_owner() {
         let owner_id = accounts(0);
         let staking_id = accounts(1);
+        let lockup_id = accounts(2);
         let context = VMContextBuilder::new();
 
         // init contract
         testing_env!(context.clone().block_timestamp(WEEK.0).build());
-        let mut contract = Contract::new(Some(owner_id.clone()), None, staking_id);
+        let mut contract = Contract::new(Some(owner_id.clone()), None, staking_id, lockup_id);
 
         // wait week
         testing_env!(context

ft-token-contract/src/owner.rs

@@ -72,7 +72,7 @@ impl Contract {
         // Initiating receiver's call and the callback
         ext_ft_receiver::ext(receiver_id.clone())
             .with_static_gas(env::prepaid_gas() - GAS_FOR_FT_TRANSFER_CALL)
-            .ft_on_transfer(sender_id.clone(), amount.into(), msg)
+            .ft_on_transfer(env::predecessor_account_id(), amount.into(), msg)
             .then(
                 ext_ft_resolver::ext(env::current_account_id())
                     .with_static_gas(GAS_FOR_RESOLVE_TRANSFER)

ft-token-contract/tests/utils.rs

@@ -4,20 +4,23 @@ use workspaces::{network::Sandbox, AccountId, Contract, Worker};
 
 pub const CONTRACT_ACCOUNT: &str = "token.v1.realisnetwork.near";
 pub const STAKING_ACCOUNT: &str = "staking.v1.realisnetwork.near";
+pub const LOCKUP_ACCOUNT: &str = "lockup.v1.realisnetwork.near";
 pub const SPEC_METADATA: &str = "ft-1.0.1";
 
 pub async fn pull_contract(worker: &Worker<Sandbox>) -> anyhow::Result<Contract> {
     let mainnet = workspaces::mainnet_archival().await?;
     let contract_id: AccountId = CONTRACT_ACCOUNT.parse()?;
     let contract = worker
         .import_contract(&contract_id, &mainnet)
-        .initial_balance(parse_near!("1000 N"))
+        .initial_balance(parse_near!("5000 N"))
         .transact()
         .await?;
 
     contract
         .call("new")
-        .args_json(serde_json::json!({ "staking_id": STAKING_ACCOUNT }))
+        .args_json(
+            serde_json::json!({ "staking_id": STAKING_ACCOUNT, "lockup_id": LOCKUP_ACCOUNT }),
+        )
         .transact()
         .await?
         .into_result()?;

scripts/deploy.sh

@@ -112,7 +112,7 @@ then
         --initArgs '{"token_account_id": "'$TOKEN_CONTRACT_ID'", "deposit_whitelist": ["'$OWNER_ID'", "'$STAKING_CONTRACT_ID'"]}' \
         --initGas 300000000000000
     echo "Register in token contract"
-    near call $TOKEN_CONTRACT_ID register '{"account_id": "'$LOCKUP_CONTRACT_ID'"}' --accountId $OWNER_ID
+    near call $TOKEN_CONTRACT_ID storage_deposit '{"account_id": "'$LOCKUP_CONTRACT_ID'"}' --accountId $OWNER_ID --deposit 1
 else
     echo "Updating contract"
     echo y | near deploy --accountId $LOCKUP_CONTRACT_ID \

test-utils/src/token.rs

@@ -35,7 +35,7 @@ pub async fn pull(
     let contract_id: AccountId = TOKEN_CONTRACT_ACCOUNT.parse()?;
     let contract = worker
         .import_contract(&contract_id, &mainnet)
-        .initial_balance(parse_near!("1000 N"))
+        .initial_balance(parse_near!("5000 N"))
         .transact()
         .await?;