securesecrets · DrPresident · Jun 21, 2022 · May 10, 2022 · May 11, 2022 · May 12, 2022
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -6,7 +6,7 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  find_contracts: # Job that list subdirectories
+  find-contracts: # Job that list subdirectories
     runs-on: ubuntu-latest
     outputs:
       dir: ${{ steps.set-dirs.outputs.dir }}
@@ -15,12 +15,42 @@ jobs:
       - id: set-dirs
         run: echo "::set-output name=dir::$(find ./contracts/ -name Cargo.toml | jq -R -s -c 'split("\n")[:-1]')"
 
-  build:
+  build-contracts:
     runs-on: ubuntu-latest
-    needs: [find_contracts] # Depends on previous job
+    needs: [find-contracts] # Depends on previous job
     strategy:
       matrix:
-        dir: ${{fromJson(needs.find_contracts.outputs.dir)}} # List matrix strategy from directories dynamically
+        dir: ${{fromJson(needs.find-contracts.outputs.dir)}} # List matrix strategy from directories dynamically
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - uses: actions-rs/cargo@v1.0.3
+        with:
+          command: build
+          args: --release --target wasm32-unknown-unknown --manifest-path=${{matrix.dir}}
+
+  find-packages: # Job that list subdirectories
+    runs-on: ubuntu-latest
+    outputs:
+      dir: ${{ steps.set-dirs.outputs.dir }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: set-dirs
+        run: echo "::set-output name=dir::$(find ./packages/ -name Cargo.toml | jq -R -s -c 'split("\n")[:-1]')"
+
+  build-packages:
+    runs-on: ubuntu-latest
+    needs: [find-packages] # Depends on previous job
+    strategy:
+      matrix:
+        dir: ${{fromJson(needs.find-packages.outputs.dir)}} # List matrix strategy from directories dynamically
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/Cargo.toml b/Cargo.toml
@@ -18,16 +18,19 @@ members = [
   "contracts/oracle",
   "contracts/sky",
 
+  "contracts/snip20-reference-impl",
+
   # DAO
   # - Core
   "contracts/treasury",
   "contracts/treasury_manager",
   # - Adapters
   "contracts/scrt_staking",
   "contracts/rewards_emission",
+  "contracts/lp_shade_swap",
 
   "contracts/snip20_staking",
-
+  
   # Mock contracts
   "contracts/mock_band",
   "contracts/mock_secretswap_pair",

diff --git a/contracts/governance/src/tests/handle/mod.rs b/contracts/governance/src/tests/handle/mod.rs
@@ -40,7 +40,7 @@ fn set_config_msg() {
                 code_hash: snip20.code_hash,
             }),
         )
-        .unwrap();
+        .unwrap().instance;
 
     chain
         .execute(
@@ -114,7 +114,7 @@ fn reject_disable_config_tokens() {
                 code_hash: snip20.code_hash,
             }),
         )
-        .unwrap();
+        .unwrap().instance;
 
     chain
         .execute(

diff --git a/contracts/governance/src/tests/handle/proposal/funding.rs b/contracts/governance/src/tests/handle/proposal/funding.rs
@@ -62,7 +62,7 @@ fn init_funding_governance_with_proposal() -> StdResult<(
             address: "funding_token".into(),
             code_hash: snip20.code_hash,
         }),
-    )?;
+    )?.instance;
 
     // Register governance
     let gov = chain.register(Box::new(Governance));
@@ -106,7 +106,7 @@ fn init_funding_governance_with_proposal() -> StdResult<(
             address: "gov".into(),
             code_hash: gov.code_hash,
         }),
-    )?;
+    )?.instance;
 
     chain.execute(
         &governance::HandleMsg::AssemblyProposal {
@@ -309,7 +309,7 @@ fn fake_funding_token() {
                 code_hash: snip20.code_hash.clone(),
             }),
         )
-        .unwrap();
+        .unwrap().instance;
 
     chain
         .execute(

diff --git a/contracts/governance/src/tests/handle/proposal/voting.rs b/contracts/governance/src/tests/handle/proposal/voting.rs
@@ -60,7 +60,7 @@ fn init_voting_governance_with_proposal() -> StdResult<(
             address: "token".into(),
             code_hash: snip20.code_hash,
         }),
-    )?;
+    )?.instance;
 
     let stkd_tkn = chain.register(Box::new(Snip20Staking));
     let stkd_tkn = chain.instantiate(
@@ -87,7 +87,7 @@ fn init_voting_governance_with_proposal() -> StdResult<(
             address: "staked_token".into(),
             code_hash: stkd_tkn.code_hash,
         }),
-    )?;
+    )?.instance;
 
     // Stake tokens
     chain.execute(
@@ -181,7 +181,7 @@ fn init_voting_governance_with_proposal() -> StdResult<(
             address: "gov".into(),
             code_hash: gov.code_hash,
         }),
-    )?;
+    )?.instance;
 
     chain.execute(
         &governance::HandleMsg::AssemblyProposal {
@@ -1238,7 +1238,7 @@ fn vote_count_percentage() {
                 code_hash: snip20.code_hash,
             }),
         )
-        .unwrap();
+        .unwrap().instance;
 
     let stkd_tkn = chain.register(Box::new(Snip20Staking));
     let stkd_tkn = chain
@@ -1267,7 +1267,7 @@ fn vote_count_percentage() {
                 code_hash: stkd_tkn.code_hash,
             }),
         )
-        .unwrap();
+        .unwrap().instance;
 
     // Stake tokens
     chain
@@ -1369,7 +1369,7 @@ fn vote_count_percentage() {
                 code_hash: gov.code_hash,
             }),
         )
-        .unwrap();
+        .unwrap().instance;
 
     chain
         .execute(

diff --git a/contracts/governance/src/tests/mod.rs b/contracts/governance/src/tests/mod.rs
@@ -43,7 +43,7 @@ pub fn init_governance(
             address: "gov".into(),
             code_hash: gov.code_hash,
         }),
-    )?;
+    )?.instance;
 
     Ok((chain, gov))
 }
@@ -102,7 +102,8 @@ pub fn gov_msg_proposal(
             padding: None,
         },
         MockEnv::new(sender, gov.clone()),
-    )
+    )?;
+    Ok(())
 }
 
 pub fn get_assembly_msgs(

diff --git a/contracts/lp_shade_swap/.cargo/config b/contracts/lp_shade_swap/.cargo/config
@@ -0,0 +1,5 @@
+[alias]
+wasm = "build --release --target wasm32-unknown-unknown"
+unit-test = "test --lib --features backtraces"
+integration-test = "test --test integration"
+schema = "run --example schema"
diff --git a/contracts/lp_shade_swap/.circleci/config.yml b/contracts/lp_shade_swap/.circleci/config.yml
@@ -0,0 +1,52 @@
+version: 2.1
+
+jobs:
+  build:
+    docker:
+      - image: rust:1.43.1
+    steps:
+      - checkout
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version
+      - restore_cache:
+          keys:
+            - v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
+      - run:
+          name: Add wasm32 target
+          command: rustup target add wasm32-unknown-unknown
+      - run:
+          name: Build
+          command: cargo wasm --locked
+      - run:
+          name: Unit tests
+          env: RUST_BACKTRACE=1
+          command: cargo unit-test --locked
+      - run:
+          name: Integration tests
+          command: cargo integration-test --locked
+      - run:
+          name: Format source code
+          command: cargo fmt
+      - run:
+          name: Build and run schema generator
+          command: cargo schema --locked
+      - run:
+          name: Ensure checked-in source code and schemas are up-to-date
+          command: |
+            CHANGES_IN_REPO=$(git status --porcelain)
+            if [[ -n "$CHANGES_IN_REPO" ]]; then
+              echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:"
+              git status && git --no-pager diff
+              exit 1
+            fi
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target/debug/.fingerprint
+            - target/debug/build
+            - target/debug/deps
+            - target/wasm32-unknown-unknown/release/.fingerprint
+            - target/wasm32-unknown-unknown/release/build
+            - target/wasm32-unknown-unknown/release/deps
+          key: v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
diff --git a/contracts/lp_shade_swap/Cargo.toml b/contracts/lp_shade_swap/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "lp_shade_swap"
+version = "0.1.0"
+authors = ["Jack Swenson <jacksonswenson22@gmail.com>"]
+edition = "2018"
+
+exclude = [
+  # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+  "contract.wasm",
+  "hash.txt",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+default = []
+# for quicker tests, cargo test --lib
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+debug-print = ["cosmwasm-std/debug-print"]
+
+[dependencies]
+cosmwasm-std = { version = "0.10", package = "secret-cosmwasm-std", features = [
+  "staking",
+] }
+cosmwasm-storage = { version = "0.10", package = "secret-cosmwasm-storage" }
+cosmwasm-schema = "0.10.1"
+secret-toolkit = { version = "0.2" }
+cosmwasm-math-compat = { path = "../../packages/cosmwasm_math_compat" }
+shade-protocol = { version = "0.1.0", path = "../../packages/shade_protocol", features = [
+      "lp_shade_swap",
+  "treasury",
+  "math",
+  "dex",
+] }
+schemars = "0.7"
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+snafu = { version = "0.6.3" }
diff --git a/contracts/lp_shade_swap/Makefile b/contracts/lp_shade_swap/Makefile
@@ -0,0 +1,68 @@
+.PHONY: check
+check:
+	cargo check
+
+.PHONY: clippy
+clippy:
+	cargo clippy
+
+PHONY: test
+test: unit-test
+
+.PHONY: unit-test
+unit-test:
+	cargo test
+
+# This is a local build with debug-prints activated. Debug prints only show up
+# in the local development chain (see the `start-server` command below)
+# and mainnet won't accept contracts built with the feature enabled.
+.PHONY: build _build
+build: _build compress-wasm
+_build:
+	RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --features="debug-print"
+
+# 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
+
+# like build-mainnet, but slower and more deterministic
+.PHONY: build-mainnet-reproducible
+build-mainnet-reproducible:
+	docker run --rm -v "$$(pwd)":/contract \
+		--mount type=volume,source="$$(basename "$$(pwd)")_cache",target=/contract/target \
+		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+		enigmampc/secret-contract-optimizer:1.0.3
+
+.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: schema
+schema:
+	cargo run --example schema
+
+# Run local development chain with four funded accounts (named a, b, c, and d)
+.PHONY: start-server
+start-server: # CTRL+C to stop
+	docker run -it --rm \
+		-p 26657:26657 -p 26656:26656 -p 1317:1317 \
+		-v $$(pwd):/root/code \
+		--name secretdev enigmampc/secret-network-sw-dev:v1.0.4-3
+
+# This relies on running `start-server` in another console
+# You can run other commands on the secretcli inside the dev image
+# by using `docker exec secretdev secretcli`.
+.PHONY: store-contract-local
+store-contract-local:
+	docker exec secretdev secretcli tx compute store -y --from a --gas 1000000 /root/code/contract.wasm.gz
+
+.PHONY: clean
+clean:
+	cargo clean
+	-rm -f ./contract.wasm ./contract.wasm.gz