working. allow toggle --skip-dry-run with bulk comment

README.md

@@ -424,6 +424,9 @@ docker buildx rm --all-inactive
 		* Contracts pallet allows deployment and execution of WebAssembly-based smart contracts
 	* What trait do smart contract accounts used in the Contracts pallet of Substrate extend?
 		* `Currency` trait
+	* How to resolve `ERROR: This contract has already been uploaded with code hash`
+		* It may be because you ran a Substrate contract node on your host machine and then tried running another one in your Docker container. So it may be necessary to run `kill -9 $(lsof -ti:30333)` on
+		both the host machine and inside the Docker container. Or just restart Docker.
 
 
 * Link

dapps/xcm/unnamed/lib.rs

@@ -83,11 +83,28 @@ mod unnamed {
             }
         }
 
+        /// Using the `OracleContractRef` we can call all the messages of the `OracleContract`
+        #[ink(message)]
+        pub fn get_entropy_for_market_id(&self, id_market: String) -> Result<(BlockNumber, String, i16, i16)> {
+            match &self.oracle_contract {
+                Some(c) => {
+                    let res = match c.clone().get_entropy_for_market_id(id_market) {
+                        Ok(r) => r,
+                        Err(_e) => panic!("arr {:?}", _e),
+                    };
+                    Ok(res)
+                },
+                None => return Err(Error::NoOracleContractAddress),
+            }
+        }
+
         /// Using the `OracleContractRef` we can call all the messages of the `OracleContract`
         #[ink(message)]
         pub fn get_oracle_contract_address(&self) -> Result<AccountId> {
             match &self.oracle_contract {
-                Some(c) => Ok(c.get_oracle_contract_address()),
+                Some(c) => {
+                    Ok(c.clone().get_oracle_contract_address())
+                },
                 None => return Err(Error::NoOracleContractAddress),
             }
         }

dapps/xcm/unnamed/oracle_contract/lib.rs

@@ -285,6 +285,7 @@ mod oracle_contract {
 
         #[ink(message)]
         pub fn get_oracle_contract_address(&self) -> AccountId {
+            ink::env::debug_println!("oracle contract address {:?}", self.env().account_id());
             self.env().account_id()
         }
 

docker/quickstart-unnamed.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 
+# compatibility cargo-contract v3.0.1
+#
 # start a fresh substrate-contracts-node and upload the "unnamed" ink!
 # smart contracts to it and then instantiate and call a method
+#
+# if you want to sky dry run then find/replace `--skip-dry-run` with `#--skip-dry-run`
+# to comment those lines out
 
 trap "echo; exit" INT
 trap "echo; exit" HUP
@@ -18,7 +23,6 @@ echo "Removing previous database..."
 # delete the blockchain database so we don't get this error when we redeploy the
 # smart contract `ERROR: This contract has already been uploaded with code hash:`
 rm -rf /tmp/ink
-sleep 5
 
 echo "Running new Substrate contracts node..."
 cd ${PARENT_DIR}/docker/
@@ -40,29 +44,52 @@ cargo contract build \
 cd $PROJECT_ROOT
 echo "Uploading sub-contract..."
 # upload sub-contract
-OUTPUT_CODE_HASH=$(
-    cargo contract upload --suri //Alice \
-	--execute \
-	--skip-confirm \
-    $PARENT_DIR/target/ink/oracle_contract/oracle_contract.wasm | tail -1
+#
+# note: provide args variable so able to comment out all `--skip-dry-run` options in bulk
+# since it breaks command if comment out a multiline command option `#--skip-dry-run \`
+# see https://stackoverflow.com/a/9522766/3208553
+args=(
+    --suri //Alice
+	--execute
+    --skip-dry-run
+	--skip-confirm
+    $PARENT_DIR/target/ink/oracle_contract/oracle_contract.wasm
 )
-echo "Uploading contract..."
+OUTPUT_CODE_HASH_SUB=$(
+    cargo contract upload "${args[@]}" | tail -1
+)
+echo "Finished uploading contract..."
+# example: '  Code hash "0x..."'
+echo $OUTPUT_CODE_HASH_SUB
+# remove text 'Code hash' and the outer double quotes of the code hash
+OUTPUT_CODE_HASH_SUB_REMOVED_LABEL=$(echo "$OUTPUT_CODE_HASH_SUB" | sed 's/Code hash//;s/$//' | tr -d '"')
+# trim whitespace
+CODE_HASH_SUB=$(echo $OUTPUT_CODE_HASH_SUB_REMOVED_LABEL)
+echo $CODE_HASH_SUB
+
+echo "Uploading main-contract..."
 # upload main-contract
+#
+args=(
+    --suri //Alice
+	--execute
+    # --skip-dry-run
+	--skip-confirm
+    $PARENT_DIR/target/ink/unnamed/unnamed.wasm
+)
 OUTPUT_CODE_HASH_MAIN=$(
-    cargo contract upload --suri //Alice \
-        --execute \
-        --skip-dry-run \
-        --skip-confirm \
-        $PARENT_DIR/target/ink/unnamed/unnamed.wasm | tail -1
+    cargo contract upload "${args[@]}" | tail -1
 )
-echo "Finished uploading contracts..."
+echo "Finished uploading contract..."
 # example: '  Code hash "0x..."'
-echo $OUTPUT_CODE_HASH
+echo $OUTPUT_CODE_HASH_MAIN
 # remove text 'Code hash' and the outer double quotes of the code hash
-OUTPUT_CODE_HASH_REMOVED_LABEL=$(echo "$OUTPUT_CODE_HASH" | sed 's/Code hash//;s/$//' | tr -d '"')
+OUTPUT_CODE_HASH_MAIN_REMOVED_LABEL=$(echo "$OUTPUT_CODE_HASH_MAIN" | sed 's/Code hash//;s/$//' | tr -d '"')
 # trim whitespace
-CODE_HASH=$(echo $OUTPUT_CODE_HASH_REMOVED_LABEL)
-echo $CODE_HASH
+CODE_HASH_MAIN=$(echo $OUTPUT_CODE_HASH_MAIN_REMOVED_LABEL)
+echo $CODE_HASH_MAIN
+
+ARG_ID_MARKET="\"my_id\""
 
 # Note: The id_market is stored as Vec<u8> format instead of String.
 # Paste the following at https://play.rust-lang.org/?version=stable&mode=debug&edition=2021
@@ -78,71 +105,105 @@ echo $CODE_HASH
 # ```
 
 # instantiate "main" contract, providing the code hash generated from uploading the "sub" contract
+echo "Instantiating main-contract..."
 
-echo "Instantiating contract..."
-OUTPUT_CONTRACT_ADDR=$(
-    cargo contract instantiate \
-        --manifest-path $PARENT_DIR/dapps/xcm/unnamed/Cargo.toml \
-        --suri //Alice \
-        --constructor new \
-        --args "$CODE_HASH" "my_id" "100" "228" "500" \
-        --execute \
-        --skip-dry-run \
-        --gas 100000000000 \
-	    --proof-size 100000000000 \
-        --skip-confirm \
-        | tail -1
+args=(
+    --manifest-path $PARENT_DIR/dapps/xcm/unnamed/Cargo.toml
+    --suri //Alice
+    --constructor new
+    --args $CODE_HASH_SUB $ARG_ID_MARKET "100" "228" "500"
+    --execute
+    --gas 100000000000
+    --proof-size 100000000000
+    # --skip-dry-run
+    --skip-confirm
+)
+OUTPUT_CONTRACT_ADDR_MAIN=$(
+    cargo contract instantiate "${args[@]}" | tail -1
 )
 
-sleep 5
+# example: '  Contract 5...'
+echo $OUTPUT_CONTRACT_ADDR_MAIN
+# remove text 'Contract'
+OUTPUT_CONTRACT_ADDR_MAIN_REMOVED_LABEL=$(echo "$OUTPUT_CONTRACT_ADDR_MAIN" | sed 's/Contract//;s/$//')
+# trim whitespace using `echo ...`
+CONTRACT_ADDR_MAIN=$(echo $OUTPUT_CONTRACT_ADDR_MAIN_REMOVED_LABEL)
+echo $CONTRACT_ADDR_MAIN
+
+echo "Instantiating sub-contract..."
+args=(
+    --manifest-path $PARENT_DIR/dapps/xcm/unnamed/oracle_contract/Cargo.toml
+    --suri //Alice
+    --constructor new
+    --args $ARG_ID_MARKET "100" "228" "500"
+    --execute
+    --gas 100000000000
+    --proof-size 100000000000
+    # --skip-dry-run
+    --skip-confirm
+)
+OUTPUT_CONTRACT_ADDR_SUB=$(
+    cargo contract instantiate "${args[@]}" | tail -1
+)
 
 # example: '  Contract 5...'
-echo $OUTPUT_CONTRACT_ADDR
+echo $OUTPUT_CONTRACT_ADDR_SUB
 # remove text 'Contract'
-OUTPUT_CONTRACT_ADDR_REMOVED_LABEL=$(echo "$OUTPUT_CONTRACT_ADDR" | sed 's/Contract//;s/$//')
-# trim whitespace
-CONTRACT_ADDR=$(echo $OUTPUT_CONTRACT_ADDR_REMOVED_LABEL)
-echo $CONTRACT_ADDR
-# echo "Calling contract method..."
-# note: an example hash value has been used
-# TODO - should the hash be '0x' prefixed?
-# cargo contract call \
-# 	--suri //Alice \
-# 	--contract $CONTRACT_ADDR \
-# 	--message set_block_for_entropy_for_market_id \
-#     --args "my_id" "228" "aef6eca62ae61934a7ab5ad3814f6e319abd3e4e4aa1a3386466ad197d1c4dea" \
-# 	--execute \
-#     --skip-dry-run \
-#     --gas 100000000000 \
-#     --proof-size 100000000000 \
-# 	--skip-confirm \
-#     | grep --color=always -z 'data'
-
-# cargo contract call \
-# 	--suri //Alice \
-# 	--contract $CONTRACT_ADDR \
-# 	--message get_entropy_for_market_id \
-#     --args "my_id" \
-# 	--execute \
-# 	--skip-confirm \
-#     | grep --color=always -z 'data'
-
-# # TODO - why is this method even necessary in the code? was it to override results incase of missed blocks?
-# #
-# # cargo contract call \
-# # 	--suri //Alice \
-# # 	--contract $CONTRACT_ADDR \
-# # 	--message set_entropy_for_market_id \
-# #     --args "my_id" "228" "aef6eca62ae61934a7ab5ad3814f6e319abd3e4e4aa1a3386466ad197d1c4dea" "0" "0" \
-# # 	--execute \
-# # 	--skip-confirm \
-# #     | grep --color=always -z 'data'
-
-# # highlight the `data` line in output containing the value of the emitted `Retrieve` event
-# cargo contract call \
-# 	--suri //Alice \
-# 	--contract $CONTRACT_ADDR \
-# 	--message get_oracle_contract_address \
-# 	--execute \
-# 	--skip-confirm \
-#     | grep --color=always -z 'data'
+OUTPUT_CONTRACT_ADDR_SUB_REMOVED_LABEL=$(echo "$OUTPUT_CONTRACT_ADDR_SUB" | sed 's/Contract//;s/$//')
+# trim whitespace using `echo ...`
+CONTRACT_ADDR_SUB=$(echo $OUTPUT_CONTRACT_ADDR_SUB_REMOVED_LABEL)
+echo $CONTRACT_ADDR_SUB
+
+ARG_BLOCK_HASH_ENTROPY="\"aef6eca62ae61934a7ab5ad3814f6e319abd3e4e4aa1a3386466ad197d1c4dea\""
+
+echo "Calling contract method set_block_for_entropy_for_market_id..."
+args=(
+	--suri //Alice
+	--contract $CONTRACT_ADDR_MAIN
+	--message set_block_for_entropy_for_market_id
+    --args $ARG_ID_MARKET "228" $ARG_BLOCK_HASH_ENTROPY
+	--execute
+    --gas 100000000000
+    --proof-size 100000000000
+    # --skip-dry-run
+	--skip-confirm
+)
+cargo contract call "${args[@]}" | grep --color=always -z 'data'
+
+echo "Calling contract method get_entropy_for_market_id ..."
+args=(
+	--suri //Alice
+	--contract $CONTRACT_ADDR_MAIN
+	--message get_entropy_for_market_id
+    --args $ARG_ID_MARKET
+	--execute
+    # --skip-dry-run
+	--skip-confirm
+)
+cargo contract call "${args[@]}" | grep --color=always -z 'data'
+
+# TODO - consider removing. maybe use to override results incase of missed blocks?
+#
+# args=(
+# 	--suri //Alice
+# 	--contract $CONTRACT_ADDR_MAIN
+# 	--message set_entropy_for_market_id
+#     --args $ARG_ID_MARKET "228" $ARG_BLOCK_HASH_ENTROPY "0" "0"
+# 	--execute
+#     # --skip-dry-run
+# 	--skip-confirm
+# )
+# cargo contract call "${args[@]}" | grep --color=always -z 'data'
+
+# highlight the `data` line in output containing the value of the emitted `Retrieve` event
+echo "Calling contract method get_oracle_contract_address ..."
+args=(
+	--suri //Alice
+	--contract $CONTRACT_ADDR_MAIN
+	--message get_oracle_contract_address
+	--execute
+    # --skip-dry-run
+	--skip-confirm
+)
+# FIXME - why doesn't this return anything?
+cargo contract call "${args[@]}" | grep --color=always -z 'data'