Skip to content
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

Fix/audit external #70

Merged
merged 6 commits into from
Sep 20, 2022
Merged

Fix/audit external #70

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5a179e
fix: move assert endedd_at to auction == true
EdoWahdana Sep 19, 2022
c9e8410
fix: remove check is_some started_at and ended_at on add_bid
EdoWahdana Sep 19, 2022
928e34b
fix: move started_at and ended_at to is_auction true
EdoWahdana Sep 19, 2022
ca8ac91
fix: unwrap and assert false
EdoWahdana Sep 19, 2022
84cc23e
fix: assert ended_at cannot be None
EdoWahdana Sep 19, 2022
4f70bea
fix: reviews
EdoWahdana Sep 20, 2022
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
47 changes: 22 additions & 25 deletions paras-marketplace-contract/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ impl Contract {
let market_data: MarketData = market_data.expect("Paras: Market data does not exist");

let buyer_id = env::predecessor_account_id();
let is_auction = market_data.is_auction.unwrap_or(false);

assert_ne!(
buyer_id, market_data.owner_id,
Expand All @@ -433,7 +434,7 @@ impl Contract {
"Paras: NEAR support only"
);

assert!(market_data.is_auction.is_none(), "Paras: the NFT is on auction");
assert_eq!(is_auction, false, "Paras: the NFT is on auction");

if ft_token_id.is_some() {
assert_eq!(
Expand Down Expand Up @@ -1651,19 +1652,15 @@ impl Contract {
let bidder_id = env::predecessor_account_id();
let current_time = env::block_timestamp();

if market_data.started_at.is_some() {
assert!(
current_time >= market_data.started_at.unwrap(),
"Paras: Sale has not started yet"
);
}
assert!(
current_time >= market_data.started_at.unwrap(),
"Paras: Sale has not started yet"
);

if market_data.ended_at.is_some() {
assert!(
current_time <= market_data.ended_at.unwrap(),
"Paras: Sale has ended"
);
}
assert!(
current_time <= market_data.ended_at.unwrap(),
"Paras: Sale has ended"
);

let remaining_time = market_data.ended_at.unwrap() - current_time;
if remaining_time <= FIVE_MINUTES {
Expand Down Expand Up @@ -1969,26 +1966,26 @@ impl Contract {

let current_time: u64 = env::block_timestamp();

if started_at.is_some() {
assert!(started_at.unwrap().0 >= current_time);
if let Some(is_auction) = is_auction {
if let Some(started_at) = started_at {
assert!(started_at.0 >= current_time);

if ended_at.is_some() {
assert!(started_at.unwrap().0 < ended_at.unwrap().0);
}
}
if let Some(ended_at) = ended_at {
assert!(started_at.0 < ended_at.0);
}
}

if let Some(is_auction) = is_auction {
if is_auction == true {
if started_at.is_none() {
started_at = Some(U64(current_time));
}
}

assert!(ended_at.is_some(), "Paras: Ended at is none")
}
assert!(ended_at.is_some(), "Paras: Ended at is none");

if ended_at.is_some() {
assert!(ended_at.unwrap().0 >= current_time);
if let Some(ended_at) = ended_at {
assert!(ended_at.0 >= current_time);
}
}
}

assert!(
Expand Down