Merge pull request #159 from provenance-io/release/v2.3.x

backmerge latest release 2.3.0
provenance-io · Aug 12, 2024 · c34b69f · c34b69f
2 parents 40ffc8f + a9d7c94
commit c34b69f
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 31 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,19 +20,159 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
+  test_tutorial_smart_contract:
+    runs-on: ubuntu-latest
+    name: Test Tutorial Smart Contract
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Add wasm32 target
+        run: |
+          rustup target add wasm32-unknown-unknown
+      - name: Build wasm binary
+        run: |
+          cd ./contracts/tutorial
+          make all
+      - name: Smart Contract Test setup
+        uses: provenance-io/provenance-testing-action@v1.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          provenance_version: "v1.19.0-rc5"
+          test_script: "./scripts/gh-action-test/tutorial_test.sh"
 
-  create_release:
+  test_attrs_smart_contract:
     runs-on: ubuntu-latest
-    name: Create Release
+    name: Test Attr Smart Contract
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Add wasm32 target
+        run: |
+          rustup target add wasm32-unknown-unknown
+      - name: Build wasm binary
+        run: |
+          cd ./contracts/attrs
+          make all
+      - name: Smart Contract Test setup
+        uses: provenance-io/provenance-testing-action@v1.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          provenance_version: "v1.19.0-rc5"
+          smart_contract_action_version: "latest"
+          test_script: "./scripts/gh-action-test/attrs_test.sh"
+
+  test_marker_smart_contract:
+    runs-on: ubuntu-latest
+    name: Test Marker Smart Contract
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Add wasm32 target
+        run: |
+          rustup target add wasm32-unknown-unknown
+      - name: Build wasm binary
+        run: |
+          cd ./contracts/marker
+          make all
+      - name: Provenance Test
+        uses: provenance-io/provenance-testing-action@v1.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          provenance_version: "v1.19.0-rc5"
+          smart_contract_action_version: "latest"
+          test_script: "./scripts/gh-action-test/marker_test.sh"
+
+  test_msgfees_smart_contract:
+    runs-on: ubuntu-latest
+    name: Test MsgFees Smart Contract
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Add wasm32 target
+        run: |
+          rustup target add wasm32-unknown-unknown
+      - name: Build wasm binary
+        run: |
+          cd ./contracts/msgfees
+          make all
+      - name: Provenance Test
+        uses: provenance-io/provenance-testing-action@v1.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          provenance_version: "v1.19.0-rc5"
+          smart_contract_action_version: "latest"
+          test_script: "./scripts/gh-action-test/msgfees_test.sh"
+
+  test_name_smart_contract:
+    runs-on: ubuntu-latest
+    name: Test Name Smart Contract
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Add wasm32 target
+        run: |
+          rustup target add wasm32-unknown-unknown
+      - name: Build wasm binary
+        run: |
+          cd ./contracts/name
+          make all
+      - name: Smart Contract Test setup
+        uses: provenance-io/provenance-testing-action@v1.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          provenance_version: "v1.19.0-rc5"
+          smart_contract_action_version: "latest"
+          test_script: "./scripts/gh-action-test/name_test.sh"
+
+  test_scope_smart_contract:
+    runs-on: ubuntu-latest
+    name: Test Scope Smart Contract
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Add wasm32 target
         run: |
           rustup target add wasm32-unknown-unknown
-      - name: Build wasm binaries
+      - name: Build wasm binary
         run: |
-          make contracts
+          cd ./contracts/scope
+          make all
+  #      - name: Smart Contract Test setup
+  #        uses: provenance-io/provenance-testing-action@v1.3.0
+  #        with:
+  #          github_token: ${{ secrets.GITHUB_TOKEN }}
+  #          provenance_version: "v1.19.0-rc5"
+  #          smart_contract_action_version: "latest"
+  #          test_script: "./scripts/gh-action-test/scope_test.sh"
+
+  test_trigger_smart_contract:
+    runs-on: ubuntu-latest
+    name: Test Trigger Smart Contract
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Add wasm32 target
+        run: |
+          rustup target add wasm32-unknown-unknown
+      - name: Build wasm binary
+        run: |
+          cd ./contracts/trigger
+          make all
+      - name: Smart Contract Test setup
+        uses: provenance-io/provenance-testing-action@v1.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          provenance_version: "v1.19.0-rc5"
+          smart_contract_action_version: "latest"
+          test_script: "./scripts/gh-action-test/trigger_test.sh"
+
+  create_release:
+    needs: [ test_attrs_smart_contract, test_marker_smart_contract, test_msgfees_smart_contract, test_name_smart_contract, test_scope_smart_contract, test_trigger_smart_contract, test_tutorial_smart_contract ]
+    runs-on: ubuntu-latest
+    name: Create Release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
       - name: Create release
         uses: softprops/action-gh-release@v1
         id: create_release
@@ -44,5 +184,5 @@ jobs:
           prerelease: false
           body_path: RELEASE_CHANGELOG.md
           token: ${{ secrets.GITHUB_TOKEN }}
-          files: |
-            **/artifacts/*.wasm
+#          files: |
+#            **/artifacts/*.wasm
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,17 @@
 
 ## Unreleased changes
 
-* test tube integration tests ([PR #150](https://github.com/provenance-io/provwasm/pull/150))
+## Releases
+
+### [v2.3.0](https://github.com/provenance-io/provwasm/tree/v2.3.0)
+
+* test tube integration tests ([#150](https://github.com/provenance-io/provwasm/pull/150))
 * fix code generation ([#150](https://github.com/provenance-io/provwasm/issues/150))
 * refactor `Any` to support Trigger messages ([#123](https://github.com/provenance-io/provwasm/issues/123))
 * Update to cosmwasm 2.x ([#141](https://github.com/provenance-io/provwasm/issues/141))
 * minimize generated types ([#152](https://github.com/provenance-io/provwasm/issues/152))
 * update to provenance 1.19.0-rc5 ([#155](https://github.com/provenance-io/provwasm/issues/155))
 
-## Releases
-
 ### [v2.2.0](https://github.com/provenance-io/provwasm/tree/v2.2.0)
 
 * Add wasm message types ([#133](https://github.com/provenance-io/provwasm/issues/133))

diff --git a/RELEASE_CHANGELOG.md b/RELEASE_CHANGELOG.md
@@ -1,6 +1,8 @@
 ### [v2.3.0](https://github.com/provenance-io/provwasm/tree/v2.3.0)
 
-* test tube integration tests ([PR #150](https://github.com/provenance-io/provwasm/pull/151))
+* test tube integration tests ([PR #150](https://github.com/provenance-io/provwasm/pull/150))
 * fix code generation ([#150](https://github.com/provenance-io/provwasm/issues/150))
 * refactor `Any` to support Trigger messages ([#123](https://github.com/provenance-io/provwasm/issues/123))
 * Update to cosmwasm 2.x ([#141](https://github.com/provenance-io/provwasm/issues/141))
+* minimize generated types ([#152](https://github.com/provenance-io/provwasm/issues/152))
+* update to provenance 1.19.0-rc5 ([#155](https://github.com/provenance-io/provwasm/issues/155))
diff --git a/dependencies/provenance b/dependencies/provenance
diff --git a/packages/proto-build/Cargo.toml b/packages/proto-build/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 repository = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
-authors = ["Ken Talley <ktalley@figure.com>"]
+authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 publish = false
 
 [dependencies]

diff --git a/packages/provwasm-common/Cargo.toml b/packages/provwasm-common/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "provwasm-common"
-version = "0.1.0"
+version = "0.1.1"
 repository = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
-authors = ["Ken Talley <ktalley@figure.com>"]
+authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 description = "Common library for ProvWasm internal"
 keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["cryptography::cryptocurrencies", "wasm"]

diff --git a/packages/provwasm-proc-macro/Cargo.toml b/packages/provwasm-proc-macro/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.2"
 repository = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
-authors = ["Ken Talley <ktalley@figure.com>"]
+authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 description = "Rust macros that simplify query and response types for Provenance Blockchain smart contracts"
 keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["api-bindings", "cryptography::cryptocurrencies", "wasm"]

diff --git a/packages/provwasm-std/Cargo.toml b/packages/provwasm-std/Cargo.toml
@@ -4,20 +4,11 @@ version = { workspace = true }
 repository = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
-authors = ["Ken Talley <ktalley@figure.com>"]
+authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 description = "Rust bindings that enable CosmWasm smart contracts to interact with custom modules in the Provenance Blockchain"
 keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["api-bindings", "cryptography::cryptocurrencies", "wasm"]
 
-[features]
-default = ["capability", "cosmos", "cosmwasm", "ibc", "provenance", "tendermint"]
-capability = []
-cosmos = []
-cosmwasm = []
-ibc = []
-provenance = []
-tendermint = []
-
 [dependencies]
 chrono = { version = "0.4.24", default-features = false }
 cosmwasm-std = { workspace = true }

diff --git a/packages/provwasm-std/src/types/mod.rs b/packages/provwasm-std/src/types/mod.rs
@@ -1,12 +1,6 @@
-#[cfg(feature = "capability")]
 pub mod capability;
-#[cfg(feature = "cosmos")]
 pub mod cosmos;
-#[cfg(feature = "cosmwasm")]
 pub mod cosmwasm;
-#[cfg(feature = "ibc")]
 pub mod ibc;
-#[cfg(feature = "provenance")]
 pub mod provenance;
-#[cfg(feature = "tendermint")]
 pub mod tendermint;