Merge pull request #25 from oraichain/feat/wasm-1.5

Feat/wasm 1.5

.vscode/settings.json

@@ -1,6 +1,3 @@
 {
-    "rust-analyzer.runnables.command": "env RUST_TEST_THREADS=1 cargo -q",
-    "rust-analyzer.cargo.extraEnv": {
-        "CARGO_TARGET_DIR": "${userHome}/.cargo/target/analyzer"
-    }
+    "rust-analyzer.runnables.command": "env RUST_TEST_THREADS=1 cargo"
 }

Cargo.toml

@@ -1,11 +1,97 @@
 [workspace]
-resolver = '2'
+resolver = "2"
 
-members = ["package/*/*"]
+members = ["packages/*/*", "contracts/*/*"]
+
+[workspace.package]
+version = "0.2.0"
+authors = ["Oraichain Labs"]
+edition = "2021"
+license = "MIT"
+repository = "https://github.com/oraichain/oraiwasm.git"
+homepage = "https://orai.io"
+documentation = "https://github.com/oraichain/oraiwasm.git"
+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",
+]
 
 [workspace.dependencies]
+cosmwasm-crypto = { version = "1.5.0" }
+cosmwasm-std = { version = "1.5.0" }
+cosmwasm-schema = { version = "1.5.0" }
+cosmwasm-storage = { version = "1.5.0" }
+cosmwasm-vm = { version = "1.5.0" }
+thiserror = "1.0.26"
+
+cw2 = { version = "1.0.1" }
+cw3 = { version = "1.0.1" }
+cw4 = { version = "1.0.1" }
+cw20 = { version = "1.0.1" }
+cw4-group = { version = "1.0.1" }
+cw-controllers = { version = "1.0.1" }
+cw20-base = { version = "1.0.1" }
+# cw-storage-plus = { version = "1.0.1" }
 cw-utils = "1.0.3"
-cw-storage-plus = { version = "1.0.1" }
+sha2 = { version = "0.9.5", default-features = false }
+serde = { version = "1.0.204" }
+schemars = { version = "0.8.21" }
+bincode = "1.2.1"
+blst = { version = "0.3.5" }
+tiny-keccak = { version = "2.0.1" }
+rand = "0.7.3"
+hex = "0.4.3"
+regex = "1.4.3"
+hex-literal = "0.3.1"
+base64 = "0.13.0"
+cw-multi-test = { version = "1.0" }
+
+sha3 = "0.10"
+bech32 = "0.8.1"
+ripemd = "0.1.1"
+
+cw-storage-plus = { path = "packages/base/storage-plus" }
+
+cw721 = { path = "packages/base/cw721" }
+cw1155 = { path = "packages/base/cw1155" }
+blsdkg = { path = "packages/base/blsdkg" }
+vrfdkgp = { path = "packages/base/vrfdkgp" }
+aioracle_base = { path = "packages/base/aioracle_base" }
+provider = { path = "packages/base/provider" }
+test_case = { path = "packages/base/test_case" }
+drand-verify = { path = "packages/base/drand-verify" }
+market_1155 = { path = "packages/base/market_1155" }
+market = { path = "packages/base/market" }
+market_ai_royalty = { path = "packages/base/market_ai_royalty" }
+market_auction_extend = { path = "packages/base/market_auction_extend" }
+market_auction = { path = "packages/base/market_auction" }
+market_rejected = { path = "packages/base/market_rejected" }
+market_whitelist = { path = "packages/base/market_whitelist" }
+market_payment = { path = "packages/base/market_payment" }
+market_datahub = { path = "packages/base/market_datahub" }
+market_royalty = { path = "packages/base/market_royalty" }
+drand_verify_v1 = { path = "packages/base/drand_verify_v1" }
+market_first_lv_royalty = { path = "packages/base/market_first_lv_royalty" }
+
+provider_bridge = { path = "contracts/aioracle/provider_bridge" }
+aioracle_v2 = { path = "contracts/aioracle/aioracle_v2" }
+aioracle_service_fees = { path = "contracts/aioracle/aioracle_service_fees" }
+
+oraichain_nft = { path = "contracts/plus/oraichain_nft" }
+market_hub = { path = "contracts/plus/market_hub" }
+market_1155_storage = { path = "contracts/plus/market_1155_storage" }
+market_ai_royalty_storage = { path = "contracts/plus/market_ai_royalty_storage" }
+market_rejected_storage = { path = "contracts/plus/market_rejected_storage" }
+market_whitelist_storage = { path = "contracts/plus/market_whitelist_storage" }
+market_datahub_storage = { path = "contracts/plus/market_datahub_storage" }
+market_auction_storage = { path = "contracts/plus/market_auction_storage" }
+market_offering_storage = { path = "contracts/plus/market_offering_storage" }
+market_first_level_royalty_storage = { path = "contracts/plus/market_first_level_royalty_storage" }
+market_payment_storage = { path = "contracts/plus/market_payment_storage" }
+market_auction_extend_storage = { path = "contracts/plus/market_auction_extend_storage" }
+ow1155 = { path = "contracts/plus/ow1155" }
+ow20 = { path = "contracts/plus/ow20" }
 
 [profile.release]
 opt-level = 3
@@ -16,4 +102,4 @@ incremental = false
 rpath = false
 lto = true
 overflow-checks = true
-panic = 'abort'
+panic = "abort"

contracts/ether/erc20/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+authors = ["Simon Warta <[email protected]>"]
+description = "An implementation of the ERC20 token interface"
+edition = { workspace = true }
+name = "erc20"
+version = "0.1.0"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+
+[features]
+backtraces = ["cosmwasm-std/backtraces"]
+
+[dependencies]
+cosmwasm-std = { workspace = true }
+cosmwasm-schema = { workspace = true }
+cosmwasm-storage = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
+
+[dev-dependencies]

contracts/ether/erc20/examples/schema.rs

@@ -0,0 +1,11 @@
+use cosmwasm_schema::write_api;
+
+use erc20::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}