Dev/cosmwasm types

.github/workflows/schedule-check-and-dispatch.yaml

@@ -0,0 +1,29 @@
+name: schedule check and dispatch
+on:
+  workflow_dispatch:
+    name: manula trigger
+  schedule:
+    - cron: "* 1 * * *"
+
+jobs:
+  populate-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - id: set-matrix
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          ./scripts/check-updates.sh
+
+  call-update-and-rebuild:
+    needs: populate-matrix
+    strategy:
+      matrix: ${{fromJson(needs.populate-matrix.outputs.matrix)}}
+    uses: ./.github/workflows/update-and-rebuild.yaml
+    with:
+      osmosis_rev: ${{ matrix.target }}

.github/workflows/update-and-rebuild.yaml

@@ -0,0 +1,60 @@
+name: update and rebuild
+on:
+  workflow_dispatch:
+    name: update and rebuild
+    inputs:
+      osmosis_rev:
+        description: "osmosis revision"
+        required: true
+        type: string
+
+  workflow_call:
+    inputs:
+      osmosis_rev:
+        required: true
+        type: string
+
+env:
+  CARGO_TERM_COLORS: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ">=1.19.0"
+
+      - name: Install buf
+        run: |
+          GO111MODULE=on go install github.com/bufbuild/buf/cmd/[email protected]
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Generate code
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          # buf is installed in GOPATH
+          export PATH=${PATH}:`go env GOPATH`/bin
+
+          ./scripts/update-and-rebuild.sh "$OSMOSIS_REV"
+
+        env:
+          OSMOSIS_REV: ${{ inputs.osmosis_rev }}

.gitignore

@@ -3,7 +3,6 @@
 debug/
 target/
 artifacts/
-!packages/osmosis-testing/libosmosistesting/artifacts
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

.gitmodules

@@ -5,4 +5,7 @@
 [submodule "dependencies/osmosis"]
 	path = dependencies/osmosis
 	url = https://github.com/osmosis-labs/osmosis.git
-	branch = v13.x
+	branch = v13.x
+[submodule "wasmd"]
+	path = dependencies/wasmd
+	url = https://github.com/CosmWasm/wasmd.git

README.md

@@ -1,3 +1,5 @@
+> :information_desk_person: If you want to use latest update from osmosis' main branch, checkout `autobuild-main` branch.
+
 # osmosis-rust
 
 Rust libraries for Osmosis. The following table shows every published crates maintained in this repository:
@@ -6,4 +8,9 @@ Rust libraries for Osmosis. The following table shows every published crates mai
 | ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
 | [osmosis-std](packages/osmosis-std)               | Osmosis's proto-generated types and helpers for interacting with the appchain. Compatible with CosmWasm contract.                                                      | [![osmosis-std on crates.io](https://img.shields.io/crates/v/osmosis-std.svg)](https://crates.io/crates/osmosis-std)                      | [![Docs](https://docs.rs/osmosis-std/badge.svg)](https://docs.rs/osmosis-std)               |
 | [osmosis-std-derive](packages/osmosis-std-derive) | Procedural macro for augmenting proto-generated types to create better developer ergonomics. Internally used by `osmosis-std`                                          | [![osmosis-std-derive on crates.io](https://img.shields.io/crates/v/osmosis-std-derive.svg)](https://crates.io/crates/osmosis-std-derive) | [![Docs](https://docs.rs/osmosis-std-derive/badge.svg)](https://docs.rs/osmosis-std-derive) |
-| [osmosis-testing](packages/osmosis-testing)       | CosmWasm x Osmosis integration testing library that, unlike `cw-multi-test`, it allows you to test your cosmwasm contract against real chain's logic instead of mocks. | [![osmosis-testing on crates.io](https://img.shields.io/crates/v/osmosis-testing.svg)](https://crates.io/crates/osmosis-testing)          | [![Docs](https://docs.rs/osmosis-testing/badge.svg)](https://docs.rs/osmosis-testing)       |
+| [osmosis-testing]()(🚩DEPRECATED IN FAVOR OF [`osmosis-test-tube`](https://github.com/osmosis-labs/test-tube/tree/main/packages/osmosis-test-tube))       | CosmWasm x Osmosis integration testing library that, unlike `cw-multi-test`, it allows you to test your cosmwasm contract against real chain's logic instead of mocks.  | [![osmosis-testing on crates.io](https://img.shields.io/crates/v/osmosis-testing.svg)](https://crates.io/crates/osmosis-testing)          | [![Docs](https://docs.rs/osmosis-testing/badge.svg)](https://docs.rs/osmosis-testing)       |
+
+
+---
+
+This repo also contains [`proto-build`](./packages/proto-build) package which is used for autogenrating rust types from proto.

examples/cosmwasm/contracts/osmosis-stargate/Developing.md

@@ -67,7 +67,7 @@ reproducible build process, so third parties can verify that the uploaded Wasm
 code did indeed come from the claimed rust code.
 
 To solve both these issues, we have produced `rust-optimizer`, a docker image to
-produce an extremely small build output in a consistent manner. The suggest way
+produce an extremely small build output in a consistent manner. The suggested way
 to run it is this:
 
 ```sh
@@ -85,7 +85,7 @@ docker run --rm -v "$(pwd)":/code \
   cosmwasm/rust-optimizer-arm64:0.12.6
 ```
 
-We must mount the contract code to `/code`. You can use a absolute path instead
+We must mount the contract code to `/code`. You can use an absolute path instead
 of `$(pwd)` if you don't want to `cd` to the directory first. The other two
 volumes are nice for speedup. Mounting `/code/target` in particular is useful
 to avoid docker overwriting your local dev files with root permissions.

examples/cosmwasm/contracts/osmosis-stargate/Importing.md

@@ -22,8 +22,8 @@ any uploaded contract.
 
 ## Reviewing
 
-Once you have done the quick programatic checks, it is good to give at least a quick
-look through the code. A glance at `examples/schema.rs` to make sure it is outputing
+Once you have done the quick programmatic checks, it is good to give at least a quick
+look through the code. A glance at `examples/schema.rs` to make sure it is outputting
 all relevant structs from `contract.rs`, and also ensure `src/lib.rs` is just the
 default wrapper (nothing funny going on there). After this point, we can dive into
 the contract code itself. Check the flows for the execute methods, any invariants and

examples/cosmwasm/contracts/osmosis-stargate/README.md

@@ -56,7 +56,7 @@ containing a simple working contract and build system that you can customize.
 
 ## Create a Repo
 
-After generating, you have a initialized local git repo, but no commits, and no remote.
+After generating, you have an initialized local git repo, but no commits, and no remote.
 Go to a server (eg. github) and create a new upstream repo (called `YOUR-GIT-URL` below).
 Then run the following:
 
@@ -96,5 +96,5 @@ to the world, once you are ready to deploy it on a running blockchain. And
 that have been published.
 
 Please replace this README file with information about your specific project. You can keep
-the `Developing.md` and `Publishing.md` files as useful referenced, but please set some
+the `Developing.md` and `Publishing.md` files as useful references, but please set some
 proper description in the README.

osmosis-rust.code-workspace

@@ -0,0 +1,17 @@
+{
+  "folders": [
+    {
+      "path": "."
+    },
+    {
+      "path": "packages/osmosis-std"
+    },
+    {
+      "path": "packages/osmosis-std-derive"
+    },
+    {
+      "path": "packages/proto-build"
+    }
+  ],
+  "settings": {}
+}

packages/osmosis-std-derive/Cargo.toml

@@ -3,7 +3,7 @@ description = "Procedural macro for osmosis-std"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "osmosis-std-derive"
-version = "0.12.0"
+version = "0.15.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

packages/osmosis-std-derive/src/lib.rs

@@ -124,7 +124,7 @@ pub fn derive_cosmwasm_ext(input: TokenStream) -> TokenStream {
     }).into()
 }
 
-fn get_type_url(attrs: &Vec<syn::Attribute>) -> proc_macro2::TokenStream {
+fn get_type_url(attrs: &[syn::Attribute]) -> proc_macro2::TokenStream {
     let proto_message = get_attr("proto_message", attrs).and_then(|a| a.parse_meta().ok());
 
     if let Some(syn::Meta::List(meta)) = proto_message.clone() {
@@ -146,7 +146,7 @@ fn get_type_url(attrs: &Vec<syn::Attribute>) -> proc_macro2::TokenStream {
     }
 }
 
-fn get_query_attrs<F>(attrs: &Vec<syn::Attribute>, f: F) -> proc_macro2::TokenStream
+fn get_query_attrs<F>(attrs: &[syn::Attribute], f: F) -> proc_macro2::TokenStream
 where
     F: FnMut(&Vec<TokenTree>) -> Option<proc_macro2::TokenStream>,
 {
@@ -185,8 +185,10 @@ where
     }
 }
 
-fn get_attr<'a>(attr_ident: &str, attrs: &'a Vec<syn::Attribute>) -> Option<&'a syn::Attribute> {
-    attrs.iter().find(|&attr| attr.path.segments.len() == 1 && attr.path.segments[0].ident == attr_ident)
+fn get_attr<'a>(attr_ident: &str, attrs: &'a [syn::Attribute]) -> Option<&'a syn::Attribute> {
+    attrs
+        .iter()
+        .find(|&attr| attr.path.segments.len() == 1 && attr.path.segments[0].ident == attr_ident)
 }
 
 fn proto_message_attr_error<T: quote::ToTokens>(tokens: T) -> proc_macro2::TokenStream {

packages/osmosis-std/Cargo.toml

@@ -3,14 +3,14 @@ description = "Standard library for Osmosis with CosmWasm support included"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "osmosis-std"
-version = "0.12.0"
+version = "0.15.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 chrono = {version = "0.4.22", default-features = false}
 cosmwasm-std = {version = "1.1.2", features = ["stargate"]}
-osmosis-std-derive = {version = "0.12.0", path = "../osmosis-std-derive"}
+osmosis-std-derive = {version = "0.15.2", path = "../osmosis-std-derive"}
 prost = {version = "0.11.0", default-features = false, features = ["prost-derive"]}
 prost-types = {version = "0.11.1", default-features = false}
 schemars = "0.8.8"

packages/osmosis-std/README.md

@@ -22,7 +22,7 @@ use osmosis_std::types::osmosis::tokenfactory::v1beta1::MsgCreateDenom;
 pub fn try_create_denom(env: Env, subdenom: String) -> Result<Response, ContractError> {
     let sender = env.contract.address.into();
 
-    // construct message and convet them into cosmos message
+    // construct message and convert them into cosmos message
     // (notice `CosmosMsg` type and `.into()`)
     let msg_create_denom: CosmosMsg = MsgCreateDenom { sender, subdenom }.into();
 
@@ -35,7 +35,7 @@ pub fn try_create_denom(env: Env, subdenom: String) -> Result<Response, Contract
 
 ## Querying Osmosis' module
 
-Each module has their own querier that derived from protobuf service definition that can be found [here](https://github.com/osmosis-labs/osmosis/tree/v12.1.0/proto/osmosis).
+Each module has its own querier that derived from protobuf service definition that can be found [here](https://github.com/osmosis-labs/osmosis/tree/v12.1.0/proto/osmosis).
 
 To avoid non-determinism in stargate queries, only some of them are whitelisted, you can find the list [here](https://github.com/osmosis-labs/osmosis/blob/v12.1.0/wasmbinding/stargate_whitelist.go).
 

packages/osmosis-std/src/lib.rs

@@ -9,3 +9,5 @@ pub const OSMOSISD_VERSION: &str = include_str!("types/OSMOSIS_COMMIT");
 mod serde;
 pub mod shim;
 pub mod types;
+
+pub use shim::{cosmwasm_to_proto_coins, try_proto_to_cosmwasm_coins};

packages/osmosis-std/src/shim.rs

@@ -1,13 +1,14 @@
 use ::serde::{ser, Deserialize, Deserializer, Serialize, Serializer};
 use chrono::{DateTime, NaiveDateTime, Utc};
+use cosmwasm_std::StdResult;
 use serde::de;
 use serde::de::Visitor;
 
 use std::fmt;
 use std::str::FromStr;
 
 use prost::Message;
-
+use std::iter::FromIterator;
 #[derive(Clone, PartialEq, Eq, ::prost::Message, schemars::JsonSchema)]
 pub struct Timestamp {
     /// Represents seconds of UTC time since Unix epoch
@@ -341,3 +342,43 @@ impl TryFrom<crate::types::cosmos::base::v1beta1::Coin> for cosmwasm_std::Coin {
         })
     }
 }
+
+/// Convert a list of `Coin` from osmosis proto generated proto `Coin` type to cosmwasm `Coin` type
+pub fn try_proto_to_cosmwasm_coins(
+    coins: impl IntoIterator<Item = crate::types::cosmos::base::v1beta1::Coin>,
+) -> StdResult<Vec<cosmwasm_std::Coin>> {
+    coins.into_iter().map(|c| c.try_into()).collect()
+}
+
+/// Convert a list of `Coin` from cosmwasm `Coin` type to  osmosis proto generated proto `Coin` type
+pub fn cosmwasm_to_proto_coins(
+    coins: impl IntoIterator<Item = cosmwasm_std::Coin>,
+) -> Vec<crate::types::cosmos::base::v1beta1::Coin> {
+    coins.into_iter().map(|c| c.into()).collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use cosmwasm_std::Uint128;
+
+    use super::*;
+
+    #[test]
+    fn test_coins_conversion() {
+        let coins = vec![
+            cosmwasm_std::Coin {
+                denom: "uatom".to_string(),
+                amount: Uint128::new(100),
+            },
+            cosmwasm_std::Coin {
+                denom: "uosmo".to_string(),
+                amount: Uint128::new(200),
+            },
+        ];
+
+        let proto_coins = cosmwasm_to_proto_coins(coins.clone());
+        let cosmwasm_coins = try_proto_to_cosmwasm_coins(proto_coins).unwrap();
+
+        assert_eq!(coins, cosmwasm_coins);
+    }
+}

packages/osmosis-std/src/types/OSMOSIS_COMMIT

@@ -1 +1 @@
-v13.0.0-rc2
+origin/main