move contract to wrapped contract

ParasHQ · Apr 24, 2021 · 41d0ad9 · 41d0ad9
1 parent 9bd7b2d
commit 41d0ad9
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,17 +1,13 @@
 [package]
-name = "paras-claim-rewards-contract"
-version = "0.1.0"
+name = "paras-claim-rewards-contract-wrapper"
+version = "0.0.1"
 authors = ["Paras"]
 edition = "2018"
 
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-serde = { version = "*", features = ["derive"] }
-serde_json = "*"
-near-sdk = "3.1.0"
-near-contract-standards = "3.1.0"
+[dev-dependencies]
+near-sdk = "=3.1.0"
+near-sdk-sim = "=3.1.0"
+paras-claim-rewards-contract = { path = "./paras-claim-rewards-contract" }
 
 [profile.release]
 codegen-units = 1
@@ -24,4 +20,6 @@ panic = "abort"
 overflow-checks = true
 
 [workspace]
-members = []
+members = [
+  "paras-claim-rewards-contract",
+]
diff --git a/build.sh b/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+cd "`dirname $0`"
+cargo build --all --target wasm32-unknown-unknown --release
+cp target/wasm32-unknown-unknown/release/*.wasm ./res/
diff --git a/package.json b/package.json
@@ -3,8 +3,7 @@
   "version": "1.0.0",
   "description": "Paras claim rewards contract",
   "scripts": {
-    "build": "cargo build --all --target wasm32-unknown-unknown --release",
-    "postbuild": "cp target/wasm32-unknown-unknown/release/paras_claim_rewards_contract.wasm ./res/",
+    "build": "./build.sh",
     "test": "cargo test -- --nocapture --color always",
     "deploy:contract:dev": "yarn build && NODE_ENV=testnet near dev-deploy --wasmFile ./res/paras_claim_rewards_contract.wasm",
     "deploy:contract:testnet": "yarn build && NODE_ENV=testnet node deployContract.js",

diff --git a/paras-claim-rewards-contract/Cargo.toml b/paras-claim-rewards-contract/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "paras-claim-rewards-contract"
+version = "0.1.0"
+authors = ["Paras"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+serde = { version = "*", features = ["derive"] }
+serde_json = "*"
+near-sdk = "3.1.0"
+near-contract-standards = "3.1.0"
diff --git a/src/lib.rs → paras-claim-rewards-contract/src/lib.rs b/src/lib.rs → paras-claim-rewards-contract/src/lib.rs
@@ -1,5 +1,5 @@
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
-use near_sdk::{env, near_bindgen, AccountId, PanicOnDefault, assert_one_yocto, Promise};
+use near_sdk::{env, near_bindgen, AccountId, PanicOnDefault, assert_one_yocto, Promise, log};
 use near_sdk::json_types::{ValidAccountId, U128};
 use near_sdk::collections::{LookupMap};
 use near_contract_standards::upgrade::Ownable;
@@ -77,9 +77,11 @@ impl Contract{
         let amount: u128 = amount.into();
         assert!(amount <= current_amount, "ERR_AMOUNT_TOO_HIGH");
 
+        log!("Claiming reward : {} PARAS", (amount as f64 / 1e24));
         current_rewards.internal_set_reward_amount(current_amount.checked_sub(amount).expect("ERR_INTEGER_OVERFLOW"));
 
         self.records.insert(&env::predecessor_account_id(), &current_rewards);
+
         ext_fungible_token::ft_transfer(
             env::predecessor_account_id().into(),
             amount.into(),
@@ -108,6 +110,8 @@ impl Contract{
         current_rewards.internal_set_reward_amount(current_amount.checked_add(amount.into()).expect("ERR_INTEGER_OVERFLOW"));
         self.records.insert(account_id.as_ref(), &current_rewards);
 
+        log!("Current reward for {} : {} PARAS", account_id.to_string(), current_rewards.internal_reward_amount() as f64 / 1e24);
+
     }
 
     /*

diff --git a/src/rewards.rs → paras-claim-rewards-contract/src/rewards.rs b/src/rewards.rs → paras-claim-rewards-contract/src/rewards.rs
diff --git a/src/token_receiver.rs → ...im-rewards-contract/src/token_receiver.rs b/src/token_receiver.rs → ...im-rewards-contract/src/token_receiver.rs
diff --git a/src/utils.rs → paras-claim-rewards-contract/src/utils.rs b/src/utils.rs → paras-claim-rewards-contract/src/utils.rs
diff --git a/res/status_message.wasm b/res/status_message.wasm