Skip to content

[WIP] Mmc 182 deployment scrip #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
p-destri wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[WIP] Mmc 182 deployment scrip #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
332ecb1
Update deployment script for rewards
p-destri Apr 6, 2023
3b272ce
fix: reward = 0 bug
p-destri Apr 25, 2023
e640b1f
feat(contract): update testnet setup
1Mateus Apr 25, 2023
3f5d520
fix: remove promise from else
p-destri Apr 26, 2023
2c25dd2
fix: wrong sign on if
p-destri Apr 26, 2023
155db75
feat(setup): updates
1Mateus Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 46 additions & 18 deletions packages/contracts/clues_contract/src/guess.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,32 @@ impl Contract {

let reward = self.calculate_guess_reward(guess, timestamp);

ext_interface::token_contract::ext(self.locked_tokens_address.clone())
.with_static_gas(BASE_GAS)
.with_attached_deposit(1)
.ft_transfer(
account_id.clone().to_string(),
reward,
"Guess reward".to_string(),
)
.then(
ext_interface::ext_self::ext(env::current_account_id())
.with_static_gas(BASE_GAS)
.undo_guess(hash, account_id),
);
if reward > U128(0) {
ext_interface::token_contract::ext(self.locked_tokens_address.clone())
.with_static_gas(BASE_GAS)
.with_attached_deposit(1)
.ft_transfer(
account_id.clone().to_string(),
reward,
"Guess reward".to_string(),
)
.then(
ext_interface::ext_self::ext(env::current_account_id())
.with_static_gas(BASE_GAS)
.undo_guess(hash, account_id),
);
} else {
self.guesses.remove(&hash);

let mut set = self
.guesses_owners
.get(&account_id)
.expect("Guess already removed from owner");

set.remove(&hash);

self.guesses_owners.insert(&account_id, &set);
}
}
}

Expand Down Expand Up @@ -296,42 +309,57 @@ mod tests {
// --------- insert 2 guesses manually
let guess = Guess {
account_id: accounts(0),
murderer: "John".to_string(),
weapon: "Glock".to_string(),
motive: "Jealous".to_string(),
murderer: "Ima Resting".to_string(),
weapon: "Meat Cleaver".to_string(),
motive: "Discovered Petey's true identity".to_string(),
random_number: U128(1),
};

let guess2 = Guess {
account_id: accounts(0),
murderer: "John".to_string(),
weapon: "Knife".to_string(),
murderer: "John Galt".to_string(),
weapon: "Meat Cleaver".to_string(),
motive: "Hunger".to_string(),
random_number: U128(1),
};

let guess3 = Guess {
account_id: accounts(0),
murderer: "potato".to_string(),
weapon: "tomato".to_string(),
motive: "apple".to_string(),
random_number: U128(1),
};

//get the hash for both guesses
let guess_hash = contract.view_hash(guess.clone());
let guess_hash2 = contract.view_hash(guess2.clone());
let guess_hash3 = contract.view_hash(guess3.clone());

contract.guesses.insert(&guess_hash, &guessing_date);
contract.guesses.insert(&guess_hash2, &guessing_date);
contract.guesses.insert(&guess_hash3, &guessing_date);

let mut set = UnorderedSet::new(StorageKey::GuessSet {
account: accounts(0),
});
set.insert(&guess_hash);
set.insert(&guess_hash2);
set.insert(&guess_hash3);
contract.guesses_owners.insert(&accounts(0), &set);

// --------- insert the answer and the rewards

contract.answer = Some(guess.clone());
contract.rewards_guessing = Some(elegible_rewards);

contract.claim_guess_rewards(guess3.clone());

let rewards_1 = contract.view_guess_reward(guess);
let rewards_2 = contract.view_guess_reward(guess2);
let rewards_3 = contract.view_guess_reward(guess3);
assert_eq!(rewards_1, U128(283_330));
assert_eq!(rewards_2, U128(94_440));
assert_eq!(rewards_3, U128(0));
}
}
1 change: 0 additions & 1 deletion packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"deploy:contract": "near deploy",
"build:contract": "node compile.js",
"dev:deploy:contract": "near dev-deploy",
"build": "RUSTFLAGS='-C link-arg=-s' cargo build --target wasm32-unknown-unknown --release",
"deploy:testnet": "(cd testnet_settings/src && node index.js)",
"build": "RUSTFLAGS='-C link-arg=-s' cargo build --target wasm32-unknown-unknown --release",
"test:integration": "yarn build && cd tests-rs && cargo test",
Expand Down
112 changes: 93 additions & 19 deletions packages/contracts/testnet_settings/src/setup.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/contracts/tests-rs/src/tests_clues.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ mod tests {
)
.await;

//verify if clue was staked - in progress - no fucking clue how to catch the answer -
//verify if clue was staked
let staked_clue = view_if_clue_is_staked(&clues, clue_id.to_string()).await?;

assert!(staked_clue);
Expand Down