xCheddar impl by YellingOilbird · Pull Request #14 · alpha-fi/cheddar

YellingOilbird · 2022-06-06T11:42:27Z

add xCheddar lockup token
upgrade cheddar to 4.0.0-pre 7
upgate fn migrate()

add xCheddar lockup token upgrade cheddar to 4.0.0-pre 7 upgate fn migrate()

robert-zaremba

partial review

cheddar/README.md

robert-zaremba · 2022-06-09T12:16:17Z

README.md

+
+## XCheddar token
+
+Token which allows users stake their Cheddar tokens and get some rewards for it. Base model is the same as CRV and veCRV locked tokens model. After 30-days period distribution of rewards starts and it counting from monthly reward parameter. Locked token have a virtual price depends on amount of locked/minted XCheddar tokens


could you add a links to CRV and veCRV?

@robert-zaremba yep, what’s required? I update all with ahead commits

links to explain CRV and veCRV

cheddar/src/lib.rs

cheddar/src/upgrade.rs

robert-zaremba · 2022-06-09T12:21:19Z

neardev/dev-account.env

@@ -0,0 +1 @@
+CONTRACT_NAME=dev-1654515440352-14631167054094


I think we should add neardev to .gitignore

robert-zaremba

let's don't include the compiled wasm code
the math for redeeming xCheddar is not clear (see the comments)

timestamp in seconds should be u64, not u32.
add docs about msg parameter for ft_transfer_call handler (ft_on_transfer)

robert-zaremba · 2022-06-22T23:48:52Z

cheddar/Cargo.toml

 serde_json = "*"
-near-sdk = { git = "https://github.com/near/near-sdk-rs", tag="3.1.0" }
-near-contract-standards = { git = "https://github.com/near/near-sdk-rs", tag="3.1.0" }
+near-sdk = "4.0.0-pre.7"


Suggested change

near-sdk = "4.0.0-pre.7"

near-sdk = "4.0.0"

v4 is already released, let's don't use -pre

we can already use v4.1.0-pre

robert-zaremba · 2022-06-22T23:49:18Z

cheddar/Cargo.toml

-near-contract-standards = { git = "https://github.com/near/near-sdk-rs", tag="3.1.0" }
+near-sdk = "4.0.0-pre.7"
+near-sys = "0.1.0"
+near-contract-standards = "4.0.0-pre.7"


Suggested change

near-contract-standards = "4.0.0-pre.7"

near-contract-standards = "4.0.0"

robert-zaremba · 2022-06-22T23:49:30Z

cheddar/Cargo.toml

 [dev-dependencies]
-# near-primitives = { git = "https://github.com/nearprotocol/nearcore.git" }
-# near-sdk-sim = { git = "https://github.com/near/near-sdk-rs.git", version="v3.1.0" }
+near-sdk-sim = "4.0.0-pre.7"


Suggested change

near-sdk-sim = "4.0.0-pre.7"

near-sdk-sim = "4.0.0"

robert-zaremba · 2022-06-22T23:49:53Z

cheddar/README.md

+```
+rustup target add wasm32-unknown-unknown
+RUSTFLAGS='-C link-arg=-s' cargo build --target wasm32-unknown-unknown --release
+cp target/wasm32-unknown-unknown/release/cheddar_coin.wasm res/cheddar_coin.wasm


we have this in Makefile. Let's use make instruction here.

robert-zaremba · 2022-06-22T23:50:31Z

cheddar/src/lib.rs

        self.assert_owner();
-        self.owner_id = owner_id.as_ref().clone();
+        assert!(
+            env::is_valid_account_id(owner_id.as_bytes()),


I think we don't need to validate, AccountId should be validated automatically

AFIAK, v4 validates account automatically

xcheddar/src/xcheddar.rs

robert-zaremba · 2022-06-23T00:21:22Z

xcheddar/src/xcheddar.rs

+    }
+
+    // return the amount of to be distribute reward this time
+    pub(crate) fn try_distribute_reward(&self, cur_timestamp_in_sec: u32) -> Balance {


Suggested change

pub(crate) fn try_distribute_reward(&self, cur_timestamp_in_sec: u32) -> Balance {

pub(crate) fn compute_distribute_reward(&self, cur_timestamp_in_sec: u32) -> Balance {

robert-zaremba · 2022-06-23T00:24:51Z

xcheddar/src/xcheddar.rs

+            self.internal_stake(&sender_id, amount);
+            PromiseOrValue::Value(U128(0))
+        } else {
+            // deposit reward


let's use a specific message for making reward desposits. Eg msg: "reward deposit" - otherwise users may run into troubles.
Also update the docs about that.

robert-zaremba · 2022-06-23T00:29:20Z

xcheddar/tests/test_reward.rs

+    total_reward += to_yocto("100");
+
+    let xcheddar_info0 = view!(xcheddar_contract.contract_metadata()).unwrap_json::<ContractMetadata>();
+    assert_xcheddar(&xcheddar_info0, to_yocto("100"), 0, 0);


Suggested change

assert_xcheddar(&xcheddar_info0, to_yocto("100"), 0, 0);

assert_xcheddar(&xcheddar_info0, total_reward, 0, 0);

htafolla · 2022-07-08T00:45:01Z

@robert-zaremba can we finalize and merge, so front-end devs can start work?

robert-zaremba · 2022-08-07T19:50:15Z

cheddar/src/lib.rs

        self.assert_owner();
-        self.owner_id = owner_id.as_ref().clone();
+        assert!(
+            env::is_valid_account_id(owner_id.as_bytes()),


AFIAK, v4 validates account automatically

robert-zaremba · 2022-08-07T19:52:43Z

cheddar/src/lib.rs

+            ext_ft_resolver::ext(env::current_account_id())
+                .with_static_gas(GAS_FOR_RESOLVE_TRANSFER)
+                .ft_resolve_transfer(sender_id, receiver_id, amount.into()),
+        )


if we want to update to a new API, then let's remove the previous version. Although I would keep the original and only do minimal changes to already deployed token.

robert-zaremba · 2022-08-07T19:54:26Z

cheddar/src/lib.rs

-        }
-        return used_amount.into();
-    }
-}


why removing?

As I correctly remember I do this because of new standards version

robert-zaremba · 2022-08-07T19:57:26Z

p3-farm-nft/P3_nft_explanation.md

@@ -0,0 +1,74 @@
+# P3 (NFT versioned) explanation 


shall we call it p4-farm-nft? We already have p3 farm, and it's working totally differently.

xCheddar impl

84d9a0e

add xCheddar lockup token upgrade cheddar to 4.0.0-pre 7 upgate fn migrate()

robert-zaremba reviewed Jun 9, 2022

View reviewed changes

YellingOilbird and others added 3 commits June 10, 2022 21:34

Add link to Curve resources

1b4a637

Delete neardev directory

0bbc253

Update cheddar/README.md

1183212

robert-zaremba requested changes Jun 23, 2022

View reviewed changes

YellingOilbird added 6 commits June 26, 2022 16:42

v4.0.0

5b3d5a5

traits update

976df7e

callbacks update

428f503

add transfer call instructions

b03eecb

modify reward to reward_per_sec

1fad008

add P tests

d2d86b3

YellingOilbird added 2 commits July 21, 2022 01:43

p3-nft

c43d8d6

Update README.md

1584f72

robert-zaremba requested changes Aug 7, 2022

View reviewed changes


		## XCheddar token

		Token which allows users stake their Cheddar tokens and get some rewards for it. Base model is the same as CRV and veCRV locked tokens model. After 30-days period distribution of rewards starts and it counting from monthly reward parameter. Locked token have a virtual price depends on amount of locked/minted XCheddar tokens

		@@ -0,0 +1 @@
		CONTRACT_NAME=dev-1654515440352-14631167054094 No newline at end of file

	near-contract-standards = "4.0.0-pre.7"
	near-contract-standards = "4.0.0"

	pub(crate) fn try_distribute_reward(&self, cur_timestamp_in_sec: u32) -> Balance {
	pub(crate) fn compute_distribute_reward(&self, cur_timestamp_in_sec: u32) -> Balance {

	assert_xcheddar(&xcheddar_info0, to_yocto("100"), 0, 0);
	assert_xcheddar(&xcheddar_info0, total_reward, 0, 0);

Conversation

YellingOilbird commented Jun 6, 2022

Uh oh!

robert-zaremba left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

robert-zaremba left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

htafolla commented Jul 8, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants