Merge pull request #55 from securesecrets/dev

Pre-MVP Release

.gitignore

@@ -17,3 +17,6 @@ contracts/hackatom/hash.txt
 
 # Auto-gen
 .cargo-ok
+
+*.pyc
+__pycache__/

Cargo.toml

@@ -1,2 +1,7 @@
 [workspace]
-members = ["contracts/mint","contracts/oracle", "packages/shade_protocol"]
+members = [
+  "packages/shade_protocol",
+  "contracts/mint",
+  "contracts/oracle", 
+  "contracts/mock_band",
+]

README.md

@@ -2,13 +2,14 @@
 | Contract                    | Reference                         | Description                           |
 | --------------------------- | --------------------------------- | ------------------------------------- |
 | [`mint`](./contracts/mint)  | [doc](./contracts/mint/README.md) | Handles asset burning and silk minting|
+| [`oracle`](./contracts/oracle)  | [doc](./contracts/oracle/README.md) | Handles asset price queries |
 
 ## Development
 
 ## Development Environment
 Instlal docker for local envirnment
 
-Source from [testner](https://build.scrt.network/dev/quickstart.html#setup-the-local-developer-testnet)
+Source from [testnet](https://build.scrt.network/dev/quickstart.html#setup-the-local-developer-testnet)
 
 ```
 docker run -it --rm -p 26657:26657 -p 26656:26656 -p 1337:1337 -v $(pwd):/root/code --name secretdev enigmampc/secret-network-sw-dev
@@ -64,4 +65,7 @@ bash ./compile-contracts.sh
 
 ### Testing
 
-You can optionally run extended tests inside a private testnet using the [contract tester](./contracts/compiled/contract_tester.py)
+You can optionally run extended tests using the [tester](contracts/compiled/tester.py)
+
+To run a test deployment on a public testnet you can run ```tester.py --testnet public```.
+For the private testnet you can run ```tester.py --testnet private```.

compile-contracts.sh

@@ -3,17 +3,23 @@
 root_dir=$(git rev-parse --show-toplevel)
 contracts_dir="${root_dir}/contracts"
 compiled_dir="${contracts_dir}/compiled"
+checksum_dir="${compiled_dir}/checksum"
 
 compile_contract() {
   # Run tests
   (cd ${contracts_dir}/$1; cargo unit-test)
-  (cd ${contracts_dir}/$1; cargo integration-test)
+  #(cd ${contracts_dir}/$1; cargo integration-test)
   (cd ${compiled_dir}; rm $1.wasm.gz)
   (cd ${contracts_dir}; cargo build --release --target wasm32-unknown-unknown --locked)
   wasm-opt -Oz ./target/wasm32-unknown-unknown/release/$1.wasm -o ./$1.wasm
+  echo $(md5sum $1.wasm | cut -f 1 -d " ") >> ${checksum_dir}/$1.txt
   cat ./$1.wasm | gzip -n -9 > ${compiled_dir}/$1.wasm.gz
   rm -f ./$1.wasm
 }
 
+# There should be a cleaner way to do this
+rm -r ${checksum_dir}
+mkdir ${checksum_dir}
 compile_contract "mint"
 compile_contract "oracle"
+compile_contract "mock_band"

contracts/compiled/checksum/mint.txt

@@ -0,0 +1 @@
+5837fae4e377ec630732b06ce018adba

contracts/compiled/checksum/mock_band.txt

@@ -0,0 +1 @@
+581bb67ce7144b7993190b46ece45893

contracts/compiled/checksum/oracle.txt

@@ -0,0 +1 @@
+ef8dc00f91dbedbff4f39fcb7161146c