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

Build mainnet #97

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Build mainnet #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85f72be
allowed testing of anyone can mint
caitlyNFT Nov 15, 2023
dd2076e
Merge pull request #1 from SatoshisPalace/anyoneCanMint
KennySwayzee93 Nov 16, 2023
7224029
add build mainnet
KennySwayzee93 Nov 16, 2023
bdeff30
add compress wasm
KennySwayzee93 Nov 16, 2023
6b9daa7
Merge branch 'master' into build-mainnet
KennySwayzee93 Nov 16, 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
14 changes: 14 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
SECRETCLI = docker exec -it secretdev /usr/bin/secretcli

# This is a build suitable for uploading to mainnet.
# Calls to `debug_print` get removed by the compiler.
.PHONY: build-mainnet _build-mainnet
build-mainnet: _build-mainnet compress-wasm
_build-mainnet:
RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown

.PHONY: compress-wasm
compress-wasm:
cp ./target/wasm32-unknown-unknown/release/*.wasm ./contract.wasm
@## The following line is not necessary, may work only on linux (extra size optimization)
@# wasm-opt -Os ./contract.wasm -o ./contract.wasm
cat ./contract.wasm | gzip -9 > ./contract.wasm.gz

.PHONY: all
all: clippy test

Expand Down
32 changes: 16 additions & 16 deletions src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,12 +837,12 @@ fn try_mint(
));
}

let minters = MintersStore::load(deps.storage)?;
if !minters.contains(&info.sender) {
return Err(StdError::generic_err(
"Minting is allowed to minter accounts only",
));
}
// let minters = MintersStore::load(deps.storage)?;
// if !minters.contains(&info.sender) {
// return Err(StdError::generic_err(
// "Minting is allowed to minter accounts only",
// ));
// }

let mut total_supply = TOTAL_SUPPLY.load(deps.storage)?;
let minted_amount = safe_add(&mut total_supply, amount.u128());
Expand Down Expand Up @@ -4272,8 +4272,8 @@ mod tests {

let handle_result = execute(deps.as_mut(), mock_env(), info, handle_msg);

let error = extract_error_msg(handle_result);
assert!(error.contains("allowed to minter accounts only"));
// let error = extract_error_msg(handle_result);
// assert!(error.contains("allowed to minter accounts only"));
}

#[test]
Expand Down Expand Up @@ -4439,8 +4439,8 @@ mod tests {

let handle_result = execute(deps.as_mut(), mock_env(), info, handle_msg);

let error = extract_error_msg(handle_result);
assert!(error.contains("allowed to minter accounts only"));
// let error = extract_error_msg(handle_result);
// assert!(error.contains("allowed to minter accounts only"));

let handle_msg = ExecuteMsg::Mint {
recipient: "bob".to_string(),
Expand All @@ -4454,8 +4454,8 @@ mod tests {

let handle_result = execute(deps.as_mut(), mock_env(), info, handle_msg);

let error = extract_error_msg(handle_result);
assert!(error.contains("allowed to minter accounts only"));
// let error = extract_error_msg(handle_result);
// assert!(error.contains("allowed to minter accounts only"));

// Removing another extra time to ensure nothing funky happens
let handle_msg = ExecuteMsg::RemoveMinters {
Expand All @@ -4480,8 +4480,8 @@ mod tests {

let handle_result = execute(deps.as_mut(), mock_env(), info, handle_msg);

let error = extract_error_msg(handle_result);
assert!(error.contains("allowed to minter accounts only"));
// let error = extract_error_msg(handle_result);
// assert!(error.contains("allowed to minter accounts only"));

let handle_msg = ExecuteMsg::Mint {
recipient: "bob".to_string(),
Expand All @@ -4495,8 +4495,8 @@ mod tests {

let handle_result = execute(deps.as_mut(), mock_env(), info, handle_msg);

let error = extract_error_msg(handle_result);
assert!(error.contains("allowed to minter accounts only"));
// let error = extract_error_msg(handle_result);
// assert!(error.contains("allowed to minter accounts only"));
}

// Query tests
Expand Down