Fix and improve terra sdk and example docs (#49)

* Fix and improve terra sdk and example docs

* Update example contract to fix ui query

Author: ali-behjati

examples/terra-contract/Developing.md

@@ -19,6 +19,13 @@ rustup target list --installed
 rustup target add wasm32-unknown-unknown
 ```
 
+This example uses relative paths in `Cargo.toml`; you must remove any `path` components within `Cargo.toml` dependencies if you intend to compile this code outside of the `pyth-sdk-terra` repository, otherwise this will fail to compile. For example:
+
+```diff
+- pyth-sdk-terra = { version = "0.3.0", path = "../../pyth-sdk-terra" }
++ pyth-sdk-terra = { version = "0.3.0" }
+```
+
 ## Compiling
 
 After changing the contract, make sure you can compile and run it before
@@ -52,18 +59,20 @@ produce an extremely small build output in a consistent manner. The suggested wa
 to run it is this:
 
 ```sh
+cd path/to/cargo/root
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer:0.12.4
+  cosmwasm/rust-optimizer:0.12.6
 ```
 
 Or, If you're on an arm64 machine, you should use a docker image built with arm64.
 ```sh
+cd path/to/cargo/root
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer-arm64:0.12.4
+  cosmwasm/rust-optimizer-arm64:0.12.6
 ```
 
 You must mount the contract code to `/code`. You can use a absolute path instead

examples/terra-contract/README.md

@@ -10,7 +10,7 @@ The example [contract](src/contract.rs) has two functions:
 
 ## Testnet Demo
 
-This example contract is running on Terra testnet at `terra1fm4ssxq39m355pdv2wzxggf5uxs2ase4vga9qs`.
+This example contract is running on Terra testnet at `terra16h868tx50d3w37ry7c5lzzg648f7yetu39p5pd`.
 This contract has been instantiated to return the price of `Crypto.LUNA/USD`.
 You can query the contract from this repo by running:
 
@@ -19,7 +19,14 @@ cd tools/
 # Install dependencies (if you haven't done so already)
 npm install
 # Query the contract
-npm run query -- --network testnet --contract terra1fm4ssxq39m355pdv2wzxggf5uxs2ase4vga9qs
+npm run query -- --network testnet --contract terra16h868tx50d3w37ry7c5lzzg648f7yetu39p5pd
+```
+
+Or by going to the contract address in [Terra Finder](https://finder.terra.money/) you can query make a query like below:
+```
+{
+  "fetch_price": {}
+}
 ```
 
 If the query is successful, the output should look like:
@@ -97,8 +104,8 @@ Storing WASM: ../artifacts/example_terra_contract.wasm (183749 bytes)
 Deploy fee:  44682uluna
 Code ID:  53227
 Sleeping for 10 seconds for store transaction to finalize.
-Migrating contract terra1rhjej5gkyelw23uh22nadqlyjvtl7s5527er97 to 53227
-Contract terra1rhjej5gkyelw23uh22nadqlyjvtl7s5527er97 code_id successfully updated to 53227
+Migrating contract terra123456789yelw23uh22nadqlyjvtl7s5527er97 to 53227
+Contract terra123456789yelw23uh22nadqlyjvtl7s5527er97 code_id successfully updated to 53227
 ```
 
 ### Troubleshooting

examples/terra-contract/schema/query_msg.json

@@ -1,8 +1,18 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "QueryMsg",
-  "type": "string",
-  "enum": [
-    "fetch_price"
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "fetch_price"
+      ],
+      "properties": {
+        "fetch_price": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    }
   ]
 }

examples/terra-contract/src/contract.rs

@@ -68,7 +68,7 @@ pub fn execute(
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
-        QueryMsg::FetchPrice => to_binary(&query_fetch_price(deps)?),
+        QueryMsg::FetchPrice {} => to_binary(&query_fetch_price(deps)?),
     }
 }
 

examples/terra-contract/src/msg.rs

@@ -25,7 +25,7 @@ pub enum ExecuteMsg {}
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    FetchPrice,
+    FetchPrice {},
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]

examples/terra-contract/tools/query.js

@@ -33,5 +33,5 @@ const CONFIG = {
 const lcd = new LCDClient(CONFIG[argv.network].terraHost);
 
 
-let queryResult = await lcd.wasm.contractQuery(argv.contract, "fetch_price")
+let queryResult = await lcd.wasm.contractQuery(argv.contract, { "fetch_price": {} })
 console.log(queryResult)

pyth-sdk-terra/README.md

@@ -38,12 +38,12 @@ This struct also has some useful functions for manipulating and combining prices
 ## Off-Chain Queries
 
 You can use the provided schemas in the `schema` directory to directly query the terra contract from off-chain applications.
-A typical query will look like:
+A typical query requires to pass the price feed id as a hex string. it will look like:
 
 ```
 {
     "price_feed": {
-        "id": "f9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b" // id of the price feed (in hex format)
+        "id": "f9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b"
     }
 }
 ```
@@ -56,7 +56,7 @@ Pyth is currently only available in Terra testnet.
 
 ### Testnet
 
-The contract address is [`terra1hdc8q4ejy82kd9w7wj389dlul9z5zz9a36jflh`](https://finder.terra.money/testnet/address/terra1wzs3rgzgjdde3kg7k3aaz6qx7sc5dcwxqe9fuc).
+The contract address is [`terra1wzs3rgzgjdde3kg7k3aaz6qx7sc5dcwxqe9fuc`](https://finder.terra.money/testnet/address/terra1wzs3rgzgjdde3kg7k3aaz6qx7sc5dcwxqe9fuc).
 
 List of available Price Feeds and their ids: