airdrop complete

mymiracle0118 · Apr 20, 2024 · 177c91c · 177c91c
1 parent 26312d5
commit 177c91c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -9,15 +9,10 @@ optimize:
 test:
 	cargo unit-test
 
-<<<<<<< HEAD
-FROM=nibi10rdtquh3jl44hg00x0plzeawuclqqet0he4692
-AIRDROP_CONTRACT=nibi10jwwkmmn0rzxvfec5swhgvtkh4l94fshz0r8ndj9ldym87lkgdjs4z4cyp
-=======
-WALLET=nibi1d3lmwkgjgdyfpsn4xgh299jnpk4r89kd5xs420
-AIRDROP_CONTRACT=nibi1lz6h4tav6q8jrpxxs6kv63hztlmpu27jj50jcnrt9p7wd2nrmz9s9600vz
-CODE_ID=421
+WALLET=nibi10rdtquh3jl44hg00x0plzeawuclqqet0he4692
+AIRDROP_CONTRACT=nibi1hc3cl36mnty08e34cp6gy4rnej378w7qhrxjxxzq3jdm04qa5w5seqwemv
+CODE_ID=436
 WALLET_NAME=jarvis
->>>>>>> f8a4af504d3b45ae487ba064c7d39c846c54be0e
 
 make-wallet:
 	@nibid keys add wallet ${WALLET_NAME}
@@ -32,7 +27,8 @@ upload-testnet:
 	@nibid tx wasm store artifacts/jarvis_airdrop.wasm --from ${WALLET} --gas auto --gas-adjustment 1.5 --gas-prices 0.025unibi --yes
 
 instantiate-testnet:
-	@nibid tx wasm instantiate ${CODE_ID} --admin ${WALLET} --label airdrop --from ${WALLET} --gas auto --gas-adjustment 1.5 --gas-prices 0.025unibi --yes
+	$(eval INSTANTIATE := $$(shell cat ./commands/instantiate.json))
+	@nibid tx wasm instantiate ${CODE_ID} '${INSTANTIATE}' --admin ${WALLET} --label airdrop --from ${WALLET} --gas auto --gas-adjustment 1.5 --gas-prices 0.025unibi --yes
 
 get-nft-contract-address:
 	$(eval GET_NFT_CONTRACT_ADDRESS := $$(shell cat ./commands/get_nft_contract_addr.json))

diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-6cad51fd1cd844c98c7e367b1b0910c4389e8f0c4a69edab1821e7aeb99094f9  jarvis_airdrop.wasm
-=======
-d63576084b69def9913aae0899dcba97a22482511bd860bac1345e455332fbfc  jarvis_airdrop.wasm
->>>>>>> f8a4af504d3b45ae487ba064c7d39c846c54be0e
+1de9e0bf7d134e86e3c279a1e25ed4fd6f82b3de72c7531a3e4152adcf822053  jarvis_airdrop.wasm
diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-deddb63d42e3a8126c7edda8a28755f4ec6f28ee7f40becb1755b5e3c1be49f7  /target/wasm32-unknown-unknown/release/jarvis_airdrop.wasm
-=======
-5f9d4a5aeeef32dfe13b0866f83378a51934ead6a95938042e1cc2966ab31032  /target/wasm32-unknown-unknown/release/jarvis_airdrop.wasm
->>>>>>> f8a4af504d3b45ae487ba064c7d39c846c54be0e
+8dcb786edb89e26d7392f4edbe4dc0831ad61ea37225d7fb24bb1b40b87429ca  /target/wasm32-unknown-unknown/release/jarvis_airdrop.wasm
diff --git a/artifacts/jarvis_airdrop.wasm b/artifacts/jarvis_airdrop.wasm
diff --git a/commands/get_count.json b/commands/get_count.json
diff --git a/commands/instantiate.json b/commands/instantiate.json
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/src/integration_tests.rs b/src/integration_tests.rs
@@ -55,16 +55,4 @@ mod tests {
         (app, cw_template_contract)
     }
 
-    mod count {
-        use super::*;
-        use crate::msg::ExecuteMsg;
-
-        #[test]
-        fn count() {
-            let (mut app, cw_template_contract) = proper_instantiate();
-
-            let cosmos_msg = cw_template_contract.call(msg).unwrap();
-            app.execute(Addr::unchecked(USER), cosmos_msg).unwrap();
-        }
-    }
 }