Deploy prod

.github/utilities/set_mainnet_environments.js

@@ -0,0 +1,28 @@
+const fs = require("fs");
+
+const environment_file_web = `
+VITE_BASE_TOKEN=jumptoken.jumpfinance.near
+VITE_LOCKED_CONTRACT=lockedjumptoken.jumpfinance.near
+VITE_STAKING_CONTRACT=xjumptoken.jumpfinance.near
+VITE_NFT_STAKING_CONTRACT=nftstaking.jumpfinance.near
+VITE_JUMP_LAUNCHPAD_CONTRACT=launchpad.jumpfinance.near
+VITE_TOKEN_LAUNCHER_CONTRACT=laboratory.jumpfinance.near
+VITE_NEAR_NETWORK=${process.env.NEAR_NETWORK}
+`;
+
+fs.writeFileSync("./packages/web/.env", environment_file_web);
+
+const environment_file_graphql = `
+SERVER_PORT=80
+DB_USERNAME=${process.env.DB_USER}
+DB_PASSWORD=${process.env.DB_PASS}
+DB_HOST=${process.env.DB_HOST}
+DB_PORT=5432
+DB_NAME=${process.env.DB_NAME}
+NFT_STAKING_CONTRACT=nftstaking.jumpfinance.near
+JUMP_LAUNCHPAD_CONTRACT=launchpad.jumpfinance.near
+ENV=MAINNET
+NEAR_RPC_URL=https://rpc.mainnet.near.org
+`;
+
+fs.writeFileSync("./packages/graphql/.env", environment_file_graphql);

.gitignore

@@ -29,3 +29,4 @@ yarn-error.log*
 **/target
 .eslintcache
 .vercel
+.vscode

old/prod_deploy.yaml

@@ -0,0 +1,110 @@
+name: Staging Deploy
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_TESTNET_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_TESTNET_PROJECT_ID }}
+  VITE_GRAPHQL_API_URI: https://prodgraphql.jumpdefi.xyz/
+  NEAR_NETWORK: mainnet
+  DB_HOST: ${{ secrets.PROD_DB_HOST }}
+  DB_NAME: ${{ secrets.PROD_DB_NAME }}
+  DB_USER: ${{ secrets.PROD_DB_USER }}
+  DB_PASS: ${{ secrets.PROD_DB_PASS }}
+  DB_PORT: 5432
+  AWS_REGION: us-east-1
+  ECS_SERVICE: staging-indexer-service
+  ECS_CLUSTER: staging-indexer-cluster
+  ECS_TASK_DEFINITION: services/indexer/task-definition.json
+  CONTAINER_NAME: staging-indexer
+
+on:
+  push:
+    branches:
+      - prod
+      - deploy-prod
+
+jobs:
+  vercel_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      # - name: Get timestamp
+      #   uses: gerred/actions/current-time@master
+      #   id: current-time
+
+      # - name: Run string replace
+      #   uses: frabert/replace-string-action@master
+      #   id: format-time
+      #   with:
+      #     pattern: '[:\.]+'
+      #     string: "${{ steps.current-time.outputs.time }}"
+      #     replace-with: "-"
+      #     flags: "g"
+
+      # - name: Install Rust
+      #   run: |
+      #     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+      #     source $HOME/.cargo/env
+      #     rustup component add rustfmt
+      #     rustup target add wasm32-unknown-unknown
+
+      - name: Install Vercel CLI
+        run: npm install --global vercel@canary
+
+      - name: Install Yarn Globally
+        run: npm install -g yarn
+
+      - name: Installing Dependencies
+        run: yarn
+
+      # Set envs for builds
+      - name: Set Mainnet environment variables
+        run: yarn setup:mainnet:env
+
+      # - name: Configure AWS credentials
+      #   uses: aws-actions/configure-aws-credentials@13d241b293754004c80624b5567555c4a39ffbe3
+      #   with:
+      #     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      #     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      #     aws-region: ${{ env.AWS_REGION }}
+
+      # - name: Login to Amazon ECR
+      #   id: login-ecr
+      #   uses: aws-actions/amazon-ecr-login@aaf69d68aa3fb14c1d5a6be9ac61fe15b48453a2
+
+      #   # Set AWS deployments - Graphql
+      # - name: Build, tag, and push GRAPHQL image to Amazon ECR
+      #   id: build-image-graphql
+      #   env:
+      #     ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+      #     ECR_REPOSITORY: jump-graphql
+      #     ECR_IMAGE: graphql
+      #   run: |
+      #     docker build . -f services/graphql/Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$ECR_IMAGE
+      #     docker push $ECR_REGISTRY/$ECR_REPOSITORY:$ECR_IMAGE
+      #     echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$ECR_IMAGE"
+
+      # - name: Deploy GRAPHQL to EB
+      #   uses: einaregilsson/beanstalk-deploy@v14
+      #   with:
+      #     aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      #     aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      #     application_name: prod-backend-graphql
+      #     environment_name: Prodbackendgraphql-env
+      #     version_label: "prod-backend-graphql-${{ steps.format-time.outputs.replaced }}"
+      #     region: us-east-1
+      #     deployment_package: services/graphql/Dockerrun.aws.json
+
+      # Deploy Vercel app
+      #- name: Pull vercel setup
+      #  run: vercel pull --yes --token=${{ secrets.VERCEL_TESTNET_TOKEN }}
+
+      #- name: Build Project Artifacts
+      #  run: vercel build --prod --token=${{ secrets.VERCEL_TESTNET_TOKEN }}
+
+      # - name: Deploy Project Artifacts to Vercel
+      #   run: >
+      #     vercel
+    #    deploy
+    #     --prod
+    #     --prebuilt
+    #     --token=${{ secrets.VERCEL_TESTNET_TOKEN }}

package.json

@@ -23,6 +23,7 @@
     "setup:lake:consumer": "node .github/utilities/build_aws_lake_credentials.js",
     "setup:testnet:env": "node .github/utilities/set_testnet_environments.js",
     "setup:staging:env": "node .github/utilities/set_staging_environments.js",
+    "setup:mainnet:env": "node .github/utilities/set_mainnet_environments.js",
     "setup:staging:db": "node .github/utilities/database_reset.js",
     "setup:staging:db:populate": "node .github/utilities/database_basic_populate.js",
 

packages/apollo/src/generated/hooks.ts

@@ -808,7 +808,17 @@ export const NftStakingProjectsConnectionDocument = gql`
     }
   }
 `;
-
+/**
+ *  rewards {
+          spec
+          name
+          symbol
+          icon
+          decimals
+          perMonth
+          account_id
+        }
+ */
 /**
  * __useNftStakingProjectsConnectionQuery__
  *
@@ -874,8 +884,6 @@ export const StakingProjectDocument = gql`
       collection_image
       collection_modal_image
       token_address
-      min_staking_period
-      early_withdraw_penalty
       rewards {
         spec
         name
@@ -885,11 +893,21 @@ export const StakingProjectDocument = gql`
         perMonth
         account_id
       }
+      min_staking_period
+      early_withdraw_penalty
     }
   }
 `;
 
-/**
+/** rewards {
+        spec
+        name
+        symbol
+        icon
+        decimals
+        perMonth
+        account_id
+      }
  * __useStakingProjectQuery__
  *
  * To run a query within a React component, call `useStakingProjectQuery` and pass it any options that fit your needs.

packages/cli/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+dist

packages/contracts/launchpad/src/listing/mod.rs

@@ -393,7 +393,10 @@ impl Listing {
         project_promise
       }
       ListingStatus::Funded => {
-        if env::block_timestamp() > self.final_sale_2_timestamp {
+        let allocation_sold_percentage = self.allocations_sold as u128 * self.token_allocation_size
+          / (self.total_amount_sale_project_tokens);
+
+        if env::block_timestamp() > self.final_sale_2_timestamp || allocation_sold_percentage >= 1 {
           self.status = ListingStatus::SaleFinalized;
           self.withdraw_project_funds()
         } else {
@@ -493,11 +496,14 @@ impl Listing {
       ((self.token_allocation_size * self.fraction_cliff_release) / FRACTION_BASE) * allocations;
     let final_release = self.token_allocation_size * allocations - initial_release - cliff_release;
     let mut total_release = initial_release;
-    if timestamp >= self.cliff_timestamp
-      && timestamp < self.end_cliff_timestamp
-    {
-      total_release += (cliff_release * (timestamp - self.cliff_timestamp) as u128)
-        / (self.end_cliff_timestamp - self.cliff_timestamp) as u128
+    if timestamp >= self.cliff_timestamp && timestamp < self.end_cliff_timestamp {
+     let time_fraction = 100;
+      let time_passed = timestamp - self.cliff_timestamp;
+      let time_total = self.end_cliff_timestamp - self.cliff_timestamp;
+
+      let acc_release = time_passed as u128 * ((cliff_release * time_fraction) / time_total as u128);
+
+      total_release += acc_release / time_fraction as u128;
     } else if timestamp >= self.end_cliff_timestamp {
       total_release += cliff_release + final_release;
     }

packages/contracts/nft_staking/api.md

@@ -104,7 +104,7 @@ The owner is responsible for 5 functions in the contract: (1) adding guardians,
         msg: String -> { "type": "Deposit", "data": { "type": "ContractTreasury" } }
 
     ```shell
-    near call <tokenContractAddress> "ft_transfer_call" '{"receiver_id": "<nftStakingAddress>", "amount": "<amount>", "msg": "{ \"type\": \"Deposit\", \"data\": { \"type\": \"ContractTreasury\" } }" }' --accountId <ownerAccountId> --depositYocto 1
+    near call <tokenContractAddress> "ft_transfer_call" '{"receiver_id": "<nftStakingAddress>", "amount": "<amount>", "msg": "{ \"type\": \"Deposit\", \"data\": { \"type\": \"Deposit\", \"data\": { \"type\": \"ContractTreasury\" } } }" }' --accountId <ownerAccountId> --depositYocto 1
     ```
 
 7. transfer
@@ -224,7 +224,7 @@ There are 3 actions that must be performed by collection owners: (1) depositing
         msg: String -> {"type": "CollectionTreasury", "collection": {"type": "NFTContract", "account_id": "<NFTContractAccountId>"} }
 
     ```shell
-    near call <rewardTokenAddress> "ft_transfer_call" '{"receiver_id": "<contractAccount>", "amount": "<quantityToDeposit>", "msg": "{ \"type\": \"CollectionTreasury\", \"collection\": {\"type\": \"NFTContract\", \"account_id\": \"<NFTContractAccountId>\"} }" }' --accountId <collectionOwnerAccountId> --depositYocto 1
+    near call <rewardTokenAddress> "ft_transfer_call" '{"receiver_id": "<contractAccount>", "amount": "<quantityToDeposit>", "msg": "{  \"type\": \"Deposit\", \"data\": { \"type\": \"CollectionTreasury\", \"collection\": {\"type\": \"NFTContract\", \"account_id\": \"<NFTContractAccountId>\"} } }" }' --accountId <collectionOwnerAccountId> --depositYocto 1
     ```
 
 2. transfer

packages/contracts/nft_staking/src/actions/view.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
-use near_sdk::{near_bindgen, AccountId, json_types::U128};
+use near_sdk::{json_types::U128, near_bindgen, AccountId};
 
 use crate::{
   types::{
-    NFTCollection, NonFungibleTokenID, SerializableFungibleTokenBalance, SerializableStakedNFT,
-    SerializableStakingProgram, FungibleTokenBalance,
+    FungibleTokenBalance, NFTCollection, NonFungibleTokenID, SerializableFungibleTokenBalance,
+    SerializableStakedNFT, SerializableStakingProgram,
   },
   Contract, ContractExt,
 };
@@ -44,6 +44,10 @@ impl Contract {
       .collect()
   }
 
+  pub fn view_total_staked_amount_for_collection(&self, collection: NFTCollection) -> U128 {
+    let staking_program = self.staking_programs.get(&collection).unwrap();
+    U128(staking_program.staked_nfts.len() as u128)
+  }
   pub fn view_staked(
     &self,
     collection: NFTCollection,
@@ -97,9 +101,7 @@ impl Contract {
     balance.into()
   }
 
-  pub fn view_contract_treasury_balance(
-    &self
-  ) -> HashMap<AccountId, U128> {
+  pub fn view_contract_treasury_balance(&self) -> HashMap<AccountId, U128> {
     let mut result = HashMap::new();
     for (key, value) in self.contract_treasury.iter() {
       result.insert(key.clone(), U128(*value));

packages/contracts/nft_staking/src/models/farm.rs

@@ -141,14 +141,14 @@ impl Farm {
     let mut rewards_map = HashMap::new();
 
     for (k, prev_dist) in self.distributions.clone().iter() {
-      let rps = *token_rps.get(k).unwrap();
+      if let Some(rps) = token_rps.get(k) {
+        let (dist, claimed) = prev_dist.claim(*rps);
 
-      let (dist, claimed) = prev_dist.claim(rps);
+        token_rps.insert(k.clone(), dist.rps);
+        self.distributions.insert(k.clone(), dist);
 
-      token_rps.insert(k.clone(), dist.rps);
-      self.distributions.insert(k.clone(), dist);
-
-      rewards_map.insert(k.clone(), claimed);
+        rewards_map.insert(k.clone(), claimed);
+      }
     }
 
     (rewards_map, token_rps)

packages/graphql/package.json

@@ -19,6 +19,7 @@
     "@types/express": "^4.17.13",
     "@types/jsonwebtoken": "^8.5.8",
     "apollo-server": "^3.9.0",
+    "big.js": "^6.2.1",
     "bn.js": "^5.2.1",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",

packages/graphql/src/modules/launchpad/resolvers.ts

@@ -39,8 +39,6 @@ export default {
     async project_allocations_sold({ listing_id }: LaunchpadListing) {
       const { allocations_sold } = await findProjectInfo(listing_id);
 
-      console.log("projectallocationssold", allocations_sold);
-
       return allocations_sold;
     },
     async project_total_amount_sale_project_tokens({