diff --git a/Cargo.lock b/Cargo.lock index fcae38add7..5ea7f0aee1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,19 +133,7 @@ checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" name = "cosmwasm-crypto" version = "1.1.9" dependencies = [ - "base64", - "criterion", - "digest 0.10.6", - "ed25519-zebra", - "english-numbers", - "hex", - "hex-literal", - "k256", - "rand_core 0.6.4", - "serde", - "serde_json", - "sha2 0.10.6", - "thiserror", + "secret-cosmwasm-crypto", ] [[package]] @@ -183,28 +171,14 @@ dependencies = [ name = "cosmwasm-std" version = "1.1.9" dependencies = [ - "base64", - "chrono", - "cosmwasm-crypto", - "cosmwasm-derive", - "cosmwasm-schema", - "derivative", - "forward_ref", - "hex", - "hex-literal", - "schemars", - "serde", - "serde-json-wasm", - "thiserror", - "uint", + "secret-cosmwasm-std", ] [[package]] name = "cosmwasm-storage" version = "1.1.9" dependencies = [ - "cosmwasm-std", - "serde", + "secret-cosmwasm-storage", ] [[package]] @@ -898,6 +872,53 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secret-cosmwasm-crypto" +version = "1.1.9" +dependencies = [ + "base64", + "criterion", + "digest 0.10.6", + "ed25519-zebra", + "english-numbers", + "hex", + "hex-literal", + "k256", + "rand_core 0.6.4", + "serde", + "serde_json", + "sha2 0.10.6", + "thiserror", +] + +[[package]] +name = "secret-cosmwasm-std" +version = "1.1.9" +dependencies = [ + "base64", + "chrono", + "cosmwasm-derive", + "cosmwasm-schema", + "derivative", + "forward_ref", + "hex", + "hex-literal", + "schemars", + "secret-cosmwasm-crypto", + "serde", + "serde-json-wasm", + "thiserror", + "uint", +] + +[[package]] +name = "secret-cosmwasm-storage" +version = "1.1.9" +dependencies = [ + "secret-cosmwasm-std", + "serde", +] + [[package]] name = "semver" version = "1.0.16" diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index 02b9fda90c..3587390c11 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -96,17 +96,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "cosmwasm-crypto" -version = "1.1.9" -dependencies = [ - "digest 0.10.6", - "ed25519-zebra", - "k256", - "rand_core 0.6.4", - "thiserror", -] - [[package]] name = "cosmwasm-derive" version = "1.1.9" @@ -138,25 +127,14 @@ dependencies = [ name = "cosmwasm-std" version = "1.1.9" dependencies = [ - "base64", - "cosmwasm-crypto", - "cosmwasm-derive", - "derivative", - "forward_ref", - "hex", - "schemars", - "serde", - "serde-json-wasm", - "thiserror", - "uint", + "secret-cosmwasm-std", ] [[package]] name = "cosmwasm-storage" version = "1.1.9" dependencies = [ - "cosmwasm-std", - "serde", + "secret-cosmwasm-storage", ] [[package]] @@ -544,6 +522,42 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secret-cosmwasm-crypto" +version = "1.1.9" +dependencies = [ + "digest 0.10.6", + "ed25519-zebra", + "k256", + "rand_core 0.6.4", + "thiserror", +] + +[[package]] +name = "secret-cosmwasm-std" +version = "1.1.9" +dependencies = [ + "base64", + "cosmwasm-derive", + "derivative", + "forward_ref", + "hex", + "schemars", + "secret-cosmwasm-crypto", + "serde", + "serde-json-wasm", + "thiserror", + "uint", +] + +[[package]] +name = "secret-cosmwasm-storage" +version = "1.1.9" +dependencies = [ + "secret-cosmwasm-std", + "serde", +] + [[package]] name = "serde" version = "1.0.152" diff --git a/contracts/hackatom/Cargo.toml b/contracts/hackatom/Cargo.toml index 21abd675de..b68e59c73c 100644 --- a/contracts/hackatom/Cargo.toml +++ b/contracts/hackatom/Cargo.toml @@ -30,7 +30,7 @@ backtraces = ["cosmwasm-std/backtraces"] [dependencies] cosmwasm-schema = { path = "../../packages/schema" } -cosmwasm-std = { path = "../../packages/std", default-features = false, features = [ +cosmwasm-std = { path = "../../packages/std-compat", default-features = false, features = [ "abort", ] } rust-argon2 = "0.8" @@ -40,4 +40,4 @@ sha2 = "0.10" thiserror = "1.0" [dev-dependencies] -cosmwasm-storage = { path = "../../packages/storage", default-features = false } +cosmwasm-storage = { path = "../../packages/storage-compat", default-features = false } diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock index b756706a7d..1e68712be5 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -2,53 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" -dependencies = [ - "gimli 0.24.0", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.3", - "once_cell", - "version_check", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object 0.25.3", - "rustc-demangle", -] - [[package]] name = "base16ct" version = "0.1.1" @@ -67,12 +20,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - [[package]] name = "block-buffer" version = "0.9.0" @@ -91,97 +38,34 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bumpalo" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" - -[[package]] -name = "bytecheck" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314889ea31cda264cb7c3d6e6e5c9415a987ecb0e72c17c00d36fbb881d34abe" -dependencies = [ - "bytecheck_derive", - "ptr_meta", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a2b3b92c135dae665a6f760205b89187638e83bed17ef3e44e83c712cf30600" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "byteorder" version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "cc" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "clru" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "591ff76ca0691bd91c1b0b5b987e5cf93b21ec810ad96665c5a569c60846dd93" - [[package]] name = "const-oid" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" -[[package]] -name = "corosensei" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd" -dependencies = [ - "autocfg", - "cfg-if", - "libc", - "scopeguard", - "windows-sys", -] - -[[package]] -name = "cosmwasm-crypto" -version = "1.1.0" -dependencies = [ - "digest 0.10.3", - "ed25519-zebra", - "k256", - "rand_core 0.6.3", - "thiserror", -] - [[package]] name = "cosmwasm-derive" -version = "1.1.0" +version = "1.1.9" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.1.0" +version = "1.1.9" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -192,7 +76,7 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.1.0" +version = "1.1.9" dependencies = [ "proc-macro2", "quote", @@ -201,49 +85,16 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.1.0" +version = "0.1.0" dependencies = [ - "base64", - "cosmwasm-crypto", - "cosmwasm-derive", - "derivative", - "forward_ref", - "hex", - "schemars", - "serde", - "serde-json-wasm", - "thiserror", - "uint", + "secret-cosmwasm-std", ] [[package]] name = "cosmwasm-storage" -version = "1.1.0" -dependencies = [ - "cosmwasm-std", - "serde", -] - -[[package]] -name = "cosmwasm-vm" -version = "1.1.0" +version = "0.1.0" dependencies = [ - "bitflags", - "bytecheck", - "clru", - "cosmwasm-crypto", - "cosmwasm-std", - "enumset", - "hex", - "loupe", - "parity-wasm", - "schemars", - "serde", - "serde_json", - "sha2 0.10.3", - "thiserror", - "wasmer", - "wasmer-middlewares", + "secret-cosmwasm-storage", ] [[package]] @@ -264,118 +115,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cranelift-bforest" -version = "0.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" -dependencies = [ - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "gimli 0.26.1", - "log", - "regalloc", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" - -[[package]] -name = "cranelift-entity" -version = "0.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" - -[[package]] -name = "cranelift-frontend" -version = "0.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if", - "lazy_static", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -417,41 +156,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "darling" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc" -dependencies = [ - "darling_core", - "quote", - "syn", -] - [[package]] name = "der" version = "0.6.0" @@ -505,32 +209,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" -[[package]] -name = "dynasm" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add9a102807b524ec050363f09e06f1504214b0e1c7797f64261c891022dce8b" -dependencies = [ - "bitflags", - "byteorder", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "dynasmrt" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fba5a42bd76a17cad4bfa00de168ee1cbfa06a5e8ce992ae880218c05641a9" -dependencies = [ - "byteorder", - "dynasm", - "memmap2", -] - [[package]] name = "ecdsa" version = "0.14.3" @@ -558,12 +236,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - [[package]] name = "elliptic-curve" version = "0.12.2" @@ -584,53 +256,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enum-iterator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "enumset" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e76129da36102af021b8e5000dab2c1c30dbef85c1e482beeff8da5dde0e0b0" -dependencies = [ - "enumset_derive", -] - -[[package]] -name = "enumset_derive" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6451128aa6655d880755345d085494cf7561a6bee7c8dc821e5d77e6d267ecd4" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "ff" version = "0.12.0" @@ -641,12 +266,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "forward_ref" version = "1.0.0" @@ -685,23 +304,6 @@ dependencies = [ "wasi 0.10.2+wasi-snapshot-preview1", ] -[[package]] -name = "gimli" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" - -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] - [[package]] name = "group" version = "0.12.0" @@ -713,33 +315,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" -dependencies = [ - "ahash", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hex" version = "0.4.3" @@ -756,36 +331,10 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "itoa" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" -dependencies = [ - "autocfg", - "hashbrown 0.11.2", - "serde", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "js-sys" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" -dependencies = [ - "wasm-bindgen", -] +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "k256" @@ -799,168 +348,18 @@ dependencies = [ "sha2 0.10.3", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "leb128" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" - [[package]] name = "libc" version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" -[[package]] -name = "libloading" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "loupe" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d" -dependencies = [ - "indexmap", - "loupe-derive", - "rustversion", -] - -[[package]] -name = "loupe-derive" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "memmap2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4647a11b578fead29cdbb34d4adef8dd3dc35b876c9c6d5240d83f205abfe96e" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "more-asserts" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7" -dependencies = [ - "memchr", -] - -[[package]] -name = "object" -version = "0.28.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" -dependencies = [ - "crc32fast", - "hashbrown 0.11.2", - "indexmap", - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" - [[package]] name = "opaque-debug" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - -[[package]] -name = "pin-project-lite" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" - [[package]] name = "pkcs8" version = "0.9.0" @@ -971,36 +370,6 @@ dependencies = [ "spki", ] -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.27" @@ -1010,26 +379,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "quote" version = "1.0.9" @@ -1039,28 +388,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha", - "rand_core 0.6.3", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - [[package]] name = "rand_core" version = "0.5.1" @@ -1079,90 +406,6 @@ dependencies = [ "getrandom 0.2.3", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - -[[package]] -name = "rayon" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regalloc" -version = "0.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" -dependencies = [ - "log", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "region" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "rend" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95" -dependencies = [ - "bytecheck", -] - [[package]] name = "rfc6979" version = "0.3.0" @@ -1174,49 +417,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rkyv" -version = "0.7.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230ae2981a885590b0dc84e0b24c0ed23ad24f7adc0eb824b26cafa961f7c36" -dependencies = [ - "bytecheck", - "hashbrown 0.12.0", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc752d5925dbcb324522f3a4c93193d17f107b2e11810913aa3ad352fa01480" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustversion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" - [[package]] name = "ryu" version = "1.0.5" @@ -1247,18 +447,6 @@ dependencies = [ "syn", ] -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "sec1" version = "0.3.0" @@ -1273,6 +461,42 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secret-cosmwasm-crypto" +version = "1.1.9" +dependencies = [ + "digest 0.10.3", + "ed25519-zebra", + "k256", + "rand_core 0.6.3", + "thiserror", +] + +[[package]] +name = "secret-cosmwasm-std" +version = "1.1.9" +dependencies = [ + "base64", + "cosmwasm-derive", + "derivative", + "forward_ref", + "hex", + "schemars", + "secret-cosmwasm-crypto", + "serde", + "serde-json-wasm", + "thiserror", + "uint", +] + +[[package]] +name = "secret-cosmwasm-storage" +version = "1.1.9" +dependencies = [ + "secret-cosmwasm-std", + "serde", +] + [[package]] name = "serde" version = "1.0.126" @@ -1291,15 +515,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_bytes" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.126" @@ -1367,12 +582,6 @@ dependencies = [ "rand_core 0.6.3", ] -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - [[package]] name = "snafu" version = "0.6.10" @@ -1404,12 +613,6 @@ dependencies = [ "der", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "staking" version = "0.0.0" @@ -1417,7 +620,6 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cosmwasm-storage", - "cosmwasm-vm", "schemars", "serde", "snafu", @@ -1429,12 +631,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "subtle" version = "2.4.1" @@ -1452,26 +648,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "target-lexicon" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff" - -[[package]] -name = "tempfile" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -dependencies = [ - "cfg-if", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi", -] - [[package]] name = "thiserror" version = "1.0.26" @@ -1492,39 +668,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tracing" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" -dependencies = [ - "lazy_static", -] - [[package]] name = "typenum" version = "1.15.0" @@ -1567,403 +710,6 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -[[package]] -name = "wasm-bindgen" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" - -[[package]] -name = "wasmer" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" -dependencies = [ - "cfg-if", - "indexmap", - "js-sys", - "loupe", - "more-asserts", - "target-lexicon", - "thiserror", - "wasm-bindgen", - "wasmer-artifact", - "wasmer-compiler", - "wasmer-compiler-cranelift", - "wasmer-compiler-singlepass", - "wasmer-derive", - "wasmer-engine", - "wasmer-engine-dylib", - "wasmer-engine-universal", - "wasmer-types", - "wasmer-vm", - "winapi", -] - -[[package]] -name = "wasmer-artifact" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325" -dependencies = [ - "enumset", - "loupe", - "thiserror", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-compiler" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c" -dependencies = [ - "enumset", - "loupe", - "rkyv", - "serde", - "serde_bytes", - "smallvec", - "target-lexicon", - "thiserror", - "wasmer-types", - "wasmparser", -] - -[[package]] -name = "wasmer-compiler-cranelift" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48be2f9f6495f08649e4f8b946a2cbbe119faf5a654aa1457f9504a99d23dae0" -dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "gimli 0.26.1", - "loupe", - "more-asserts", - "rayon", - "smallvec", - "target-lexicon", - "tracing", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-compiler-singlepass" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ca2a35204d8befa85062bc7aac259a8db8070b801b8a783770ba58231d729e" -dependencies = [ - "byteorder", - "dynasm", - "dynasmrt", - "gimli 0.26.1", - "lazy_static", - "loupe", - "more-asserts", - "rayon", - "smallvec", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-derive" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "wasmer-engine" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45" -dependencies = [ - "backtrace", - "enumset", - "lazy_static", - "loupe", - "memmap2", - "more-asserts", - "rustc-demangle", - "serde", - "serde_bytes", - "target-lexicon", - "thiserror", - "wasmer-artifact", - "wasmer-compiler", - "wasmer-types", - "wasmer-vm", -] - -[[package]] -name = "wasmer-engine-dylib" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" -dependencies = [ - "cfg-if", - "enum-iterator", - "enumset", - "leb128", - "libloading", - "loupe", - "object 0.28.3", - "rkyv", - "serde", - "tempfile", - "tracing", - "wasmer-artifact", - "wasmer-compiler", - "wasmer-engine", - "wasmer-object", - "wasmer-types", - "wasmer-vm", - "which", -] - -[[package]] -name = "wasmer-engine-universal" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" -dependencies = [ - "cfg-if", - "enumset", - "leb128", - "loupe", - "region", - "rkyv", - "wasmer-compiler", - "wasmer-engine", - "wasmer-engine-universal-artifact", - "wasmer-types", - "wasmer-vm", - "winapi", -] - -[[package]] -name = "wasmer-engine-universal-artifact" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41" -dependencies = [ - "enum-iterator", - "enumset", - "loupe", - "rkyv", - "thiserror", - "wasmer-artifact", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-middlewares" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7812438ed2f37203a37007cdb5332b8475cb2b16e15d51299b2647894e9ed3a" -dependencies = [ - "loupe", - "wasmer", - "wasmer-types", - "wasmer-vm", -] - -[[package]] -name = "wasmer-object" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" -dependencies = [ - "object 0.28.3", - "thiserror", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-types" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" -dependencies = [ - "backtrace", - "enum-iterator", - "indexmap", - "loupe", - "more-asserts", - "rkyv", - "serde", - "thiserror", -] - -[[package]] -name = "wasmer-vm" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" -dependencies = [ - "backtrace", - "cc", - "cfg-if", - "corosensei", - "enum-iterator", - "indexmap", - "lazy_static", - "libc", - "loupe", - "mach", - "memoffset", - "more-asserts", - "region", - "rkyv", - "scopeguard", - "serde", - "thiserror", - "wasmer-artifact", - "wasmer-types", - "winapi", -] - -[[package]] -name = "wasmparser" -version = "0.83.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" - -[[package]] -name = "which" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" -dependencies = [ - "either", - "libc", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" - -[[package]] -name = "windows_i686_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" - -[[package]] -name = "windows_i686_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" - [[package]] name = "zeroize" version = "1.5.7" diff --git a/contracts/staking/Cargo.toml b/contracts/staking/Cargo.toml index 2cb5e43fa8..c73d93c34e 100644 --- a/contracts/staking/Cargo.toml +++ b/contracts/staking/Cargo.toml @@ -25,19 +25,14 @@ overflow-checks = true [features] # Add feature "cranelift" to default if you need 32 bit or ARM support default = [] -# Use cranelift backend instead of singlepass. This is required for development on 32 bit or ARM machines. -cranelift = ["cosmwasm-vm/cranelift"] # for quicker tests, cargo test --lib # for more explicit tests, cargo test --features=backtraces -backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"] +backtraces = ["cosmwasm-std/backtraces"] [dependencies] cosmwasm-schema = { path = "../../packages/schema" } -cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["staking"] } -cosmwasm-storage = { path = "../../packages/storage", default-features = false } +cosmwasm-std = { path = "../../packages/std-alias", default-features = false, features = ["staking"] } +cosmwasm-storage = { path = "../../packages/storage-alias", default-features = false } schemars = "0.8.3" serde = { version = "1.0.103", default-features = false, features = ["derive"] } snafu = "0.6.6" - -[dev-dependencies] -cosmwasm-vm = { path = "../../packages/vm", default-features = false, features = ["staking"] } diff --git a/packages/crypto-compat/Cargo.toml b/packages/crypto-compat/Cargo.toml new file mode 100644 index 0000000000..46c14d8ed0 --- /dev/null +++ b/packages/crypto-compat/Cargo.toml @@ -0,0 +1,20 @@ +[package] +name = "cosmwasm-crypto" +version = "1.1.9" +authors = [ + "SCRT Labs ", +] +edition = "2021" +description = "Compatability layer for contracts that want to use the git versions of the std fork with a patch" +repository = "https://github.com/scrtlabs/cosmwasm/tree/secret/packages/crypto" +license = "Apache-2.0" + +[features] +default = [] +# backtraces provides much better context at runtime errors (in non-wasm code) +# at the cost of a bit of code size and performance. +# This feature requires Rust nightly because it depends on the unstable backtrace feature. +backtraces = [] + +[dependencies] +secret-cosmwasm-crypto = { path = "../crypto" } \ No newline at end of file diff --git a/packages/crypto-compat/src/lib.rs b/packages/crypto-compat/src/lib.rs new file mode 100644 index 0000000000..607f3b2c70 --- /dev/null +++ b/packages/crypto-compat/src/lib.rs @@ -0,0 +1 @@ +pub use secret_cosmwasm_crypto::*; diff --git a/packages/crypto/Cargo.toml b/packages/crypto/Cargo.toml index 5afe297715..fb612df04e 100644 --- a/packages/crypto/Cargo.toml +++ b/packages/crypto/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cosmwasm-crypto" +name = "secret-cosmwasm-crypto" version = "1.1.9" authors = [ "Mauro Lacy ", @@ -7,7 +7,7 @@ authors = [ ] edition = "2021" description = "Crypto bindings for cosmwasm contracts" -repository = "https://github.com/scrtlabs/cosmwasm/tree/secret/packages/crypto" +repository = "https://github.com/scrtlabs/cosmwasm/tree/secret/packages/crypto-secret" license = "Apache-2.0" [features] diff --git a/packages/derive/Cargo.toml b/packages/derive/Cargo.toml index 939cebab5d..477d5ce27c 100644 --- a/packages/derive/Cargo.toml +++ b/packages/derive/Cargo.toml @@ -22,4 +22,4 @@ syn = { version = "1.0", features = ["full"] } # "What's even more fun, Cargo packages actually can have cyclic dependencies. # "(a package can have an indirect dev-dependency on itself)" # https://users.rust-lang.org/t/does-cargo-support-cyclic-dependencies/35666/3 -cosmwasm-std = { path = "../std" } +cosmwasm-std = { path = "../std-compat" } diff --git a/packages/std-compat/Cargo.toml b/packages/std-compat/Cargo.toml new file mode 100644 index 0000000000..5318b547c0 --- /dev/null +++ b/packages/std-compat/Cargo.toml @@ -0,0 +1,35 @@ +[package] +name = "cosmwasm-std" +version = "1.1.9" +edition = "2021" +description = "Compatability layer for contracts that want to use the git versions of the std fork with a patch" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[features] +default = [] +abort = [] +# iterator allows us to iterate over all DB items in a given range +# optional as some merkle stores (like tries) don't support this +# given Ethereum 1.0, 2.0, Substrate, and other major projects use Tries +# we keep this optional, to allow possible future integration (or different Cosmos Backends) +iterator = ["secret-cosmwasm-std/iterator"] +# staking exposes bindings to a required staking moudle in the runtime, via new +# CosmosMsg types, and new QueryRequest types. This should only be enabled on contracts +# that require these types, so other contracts can be used on systems with eg. PoA consensus +staking = [] +# backtraces provides much better context at runtime errors (in non-wasm code) +# at the cost of a bit of code size and performance. +# This feature requires Rust nightly because it depends on the unstable backtrace feature. +backtraces = [] +# stargate enables stargate-dependent messages and queries, like raw protobuf messages +# as well as ibc-related functionality +stargate = [] +# ibc3 extends ibc messages with ibc-v3 only features. This should only be enabled on contracts +# that require these types. Without this, they get the smaller ibc-v1 API. +ibc3 = ["stargate"] +# This feature makes `BankQuery::Supply` available for the contract to call, but requires +# the host blockchain to run CosmWasm `1.1.0` or higher. +cosmwasm_1_1 = ["secret-cosmwasm-std/cosmwasm_1_1"] + +[dependencies] +secret-cosmwasm-std = { path = "../std" } \ No newline at end of file diff --git a/packages/std-compat/src/lib.rs b/packages/std-compat/src/lib.rs new file mode 100644 index 0000000000..6509bb3e45 --- /dev/null +++ b/packages/std-compat/src/lib.rs @@ -0,0 +1 @@ +pub use secret_cosmwasm_std::*; diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index b6a39fd838..6f394b0634 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "cosmwasm-std" +name = "secret-cosmwasm-std" version = "1.1.9" authors = [ "Ethan Frey ", "SCRT Labs ", ] edition = "2021" -description = "Standard library for Wasm based smart contracts on Cosmos blockchains" -repository = "https://github.com/scrtlabs/cosmwasm/tree/secret/packages/std" +description = "Secret Network fork of the standard library for Wasm based smart contracts on Cosmos blockchains" +repository = "https://github.com/scrtlabs/cosmwasm/tree/secret/packages/std-secret" license = "Apache-2.0" readme = "README.md" @@ -60,7 +60,7 @@ hex = "0.4" uint = "0.9.3" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -cosmwasm-crypto = { path = "../crypto", version = "1.1.9" } +secret-cosmwasm-crypto = { path = "../crypto", version = "1.1.9" } [dev-dependencies] cosmwasm-schema = { path = "../schema" } diff --git a/packages/std/examples/schema.rs b/packages/std/examples/schema.rs index 0fe2eac963..f4aec2138e 100644 --- a/packages/std/examples/schema.rs +++ b/packages/std/examples/schema.rs @@ -2,7 +2,7 @@ use std::env::current_dir; use std::fs::create_dir_all; use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, schema_for}; -use cosmwasm_std::{BlockInfo, CosmosMsg, Empty, QueryRequest, Timestamp}; +use secret_cosmwasm_std::{BlockInfo, CosmosMsg, Empty, QueryRequest, Timestamp}; fn main() { let mut out_dir = current_dir().unwrap(); diff --git a/packages/std/src/addresses.rs b/packages/std/src/addresses.rs index ef03d5ab60..13b62d6569 100644 --- a/packages/std/src/addresses.rs +++ b/packages/std/src/addresses.rs @@ -39,7 +39,7 @@ impl Addr { /// ## Examples /// /// ``` - /// # use cosmwasm_std::{Addr}; + /// # use secret_cosmwasm_std::{Addr}; /// let address = Addr::unchecked("foobar"); /// assert_eq!(address, "foobar"); /// ``` diff --git a/packages/std/src/assertions.rs b/packages/std/src/assertions.rs index bc67312b71..e1ce4d9756 100644 --- a/packages/std/src/assertions.rs +++ b/packages/std/src/assertions.rs @@ -15,7 +15,7 @@ /// # /// # fn body() -> Result<(), ContractError> { /// # let permissions = Permissions { delegate: true }; -/// use cosmwasm_std::ensure; +/// use secret_cosmwasm_std::ensure; /// ensure!(permissions.delegate, ContractError::DelegatePerm {}); /// /// // is the same as @@ -39,7 +39,7 @@ macro_rules! ensure { /// it returns the third argument `x` wrapped in `Err(x)`. /// /// ``` -/// # use cosmwasm_std::{MessageInfo, Addr}; +/// # use secret_cosmwasm_std::{MessageInfo, Addr}; /// # /// # enum ContractError { /// # Unauthorized {}, @@ -51,7 +51,7 @@ macro_rules! ensure { /// # fn body() -> Result<(), ContractError> { /// # let info = MessageInfo { sender: Addr::unchecked("foo"), funds: Vec::new() }; /// # let cfg = Config { admin: "foo".to_string() }; -/// use cosmwasm_std::ensure_eq; +/// use secret_cosmwasm_std::ensure_eq; /// /// ensure_eq!(info.sender, cfg.admin, ContractError::Unauthorized {}); /// @@ -83,7 +83,7 @@ macro_rules! ensure_eq { /// # /// # fn body() -> Result<(), ContractError> { /// # let voting_power = 123; -/// use cosmwasm_std::ensure_ne; +/// use secret_cosmwasm_std::ensure_ne; /// /// ensure_ne!(voting_power, 0, ContractError::NotAVoter {}); /// diff --git a/packages/std/src/binary.rs b/packages/std/src/binary.rs index 4ee4b253fb..33aab4eba3 100644 --- a/packages/std/src/binary.rs +++ b/packages/std/src/binary.rs @@ -39,7 +39,7 @@ impl Binary { /// Copy to array of explicit length /// /// ``` - /// # use cosmwasm_std::Binary; + /// # use secret_cosmwasm_std::Binary; /// let binary = Binary::from(&[0xfb, 0x1f, 0x37]); /// let array: [u8; 3] = binary.to_array().unwrap(); /// assert_eq!(array, [0xfb, 0x1f, 0x37]); @@ -48,7 +48,7 @@ impl Binary { /// Copy to integer /// /// ``` - /// # use cosmwasm_std::Binary; + /// # use secret_cosmwasm_std::Binary; /// let binary = Binary::from(&[0x8b, 0x67, 0x64, 0x84, 0xb5, 0xfb, 0x1f, 0x37]); /// let num = u64::from_be_bytes(binary.to_array().unwrap()); /// assert_eq!(num, 10045108015024774967); diff --git a/packages/std/src/coin.rs b/packages/std/src/coin.rs index 289911deef..0c323a1763 100644 --- a/packages/std/src/coin.rs +++ b/packages/std/src/coin.rs @@ -34,8 +34,8 @@ impl fmt::Display for Coin { /// # Examples /// /// ``` -/// # use cosmwasm_std::{coins, BankMsg, CosmosMsg, Response, SubMsg}; -/// # use cosmwasm_std::testing::{mock_env, mock_info}; +/// # use secret_cosmwasm_std::{coins, BankMsg, CosmosMsg, Response, SubMsg}; +/// # use secret_cosmwasm_std::testing::{mock_env, mock_info}; /// # let env = mock_env(); /// # let info = mock_info("sender", &[]); /// let tip = coins(123, "ucosm"); @@ -55,8 +55,8 @@ pub fn coins(amount: u128, denom: impl Into) -> Vec { /// # Examples /// /// ``` -/// # use cosmwasm_std::{coin, BankMsg, CosmosMsg, Response, SubMsg}; -/// # use cosmwasm_std::testing::{mock_env, mock_info}; +/// # use secret_cosmwasm_std::{coin, BankMsg, CosmosMsg, Response, SubMsg}; +/// # use secret_cosmwasm_std::testing::{mock_env, mock_info}; /// # let env = mock_env(); /// # let info = mock_info("sender", &[]); /// let tip = vec![ diff --git a/packages/std/src/errors/recover_pubkey_error.rs b/packages/std/src/errors/recover_pubkey_error.rs index ddc9626fc7..e9710f4d09 100644 --- a/packages/std/src/errors/recover_pubkey_error.rs +++ b/packages/std/src/errors/recover_pubkey_error.rs @@ -1,5 +1,5 @@ #[cfg(not(target_arch = "wasm32"))] -use cosmwasm_crypto::CryptoError; +use secret_cosmwasm_crypto::CryptoError; #[cfg(feature = "backtraces")] use std::backtrace::Backtrace; use std::fmt::Debug; diff --git a/packages/std/src/errors/signing_error.rs b/packages/std/src/errors/signing_error.rs index b1c5f9d748..4908424041 100644 --- a/packages/std/src/errors/signing_error.rs +++ b/packages/std/src/errors/signing_error.rs @@ -4,7 +4,7 @@ use std::fmt::Debug; use thiserror::Error; #[cfg(not(target_arch = "wasm32"))] -use cosmwasm_crypto::CryptoError; +use secret_cosmwasm_crypto::CryptoError; #[derive(Error, Debug)] pub enum SigningError { diff --git a/packages/std/src/errors/verification_error.rs b/packages/std/src/errors/verification_error.rs index 60375294aa..6a369682ba 100644 --- a/packages/std/src/errors/verification_error.rs +++ b/packages/std/src/errors/verification_error.rs @@ -4,7 +4,7 @@ use std::fmt::Debug; use thiserror::Error; #[cfg(not(target_arch = "wasm32"))] -use cosmwasm_crypto::CryptoError; +use secret_cosmwasm_crypto::CryptoError; #[derive(Error, Debug)] pub enum VerificationError { diff --git a/packages/std/src/hex_binary.rs b/packages/std/src/hex_binary.rs index 4aa5f7cc8e..ab04386d91 100644 --- a/packages/std/src/hex_binary.rs +++ b/packages/std/src/hex_binary.rs @@ -35,7 +35,7 @@ impl HexBinary { /// Copy to array of explicit length /// /// ``` - /// # use cosmwasm_std::HexBinary; + /// # use secret_cosmwasm_std::HexBinary; /// let data = HexBinary::from(&[0xfb, 0x1f, 0x37]); /// let array: [u8; 3] = data.to_array().unwrap(); /// assert_eq!(array, [0xfb, 0x1f, 0x37]); @@ -44,7 +44,7 @@ impl HexBinary { /// Copy to integer /// /// ``` - /// # use cosmwasm_std::HexBinary; + /// # use secret_cosmwasm_std::HexBinary; /// let data = HexBinary::from(&[0x8b, 0x67, 0x64, 0x84, 0xb5, 0xfb, 0x1f, 0x37]); /// let num = u64::from_be_bytes(data.to_array().unwrap()); /// assert_eq!(num, 10045108015024774967); diff --git a/packages/std/src/ibc.rs b/packages/std/src/ibc.rs index 1ce06432a6..5829609e45 100644 --- a/packages/std/src/ibc.rs +++ b/packages/std/src/ibc.rs @@ -558,7 +558,7 @@ impl IbcBasicResponse { /// ## Examples /// /// ``` - /// use cosmwasm_std::{attr, IbcBasicResponse}; + /// use secret_cosmwasm_std::{attr, IbcBasicResponse}; /// /// let attrs = vec![ /// ("action", "reaction"), @@ -581,7 +581,7 @@ impl IbcBasicResponse { /// ## Examples /// /// ``` - /// use cosmwasm_std::{CosmosMsg, IbcBasicResponse}; + /// use secret_cosmwasm_std::{CosmosMsg, IbcBasicResponse}; /// /// fn make_response_with_msgs(msgs: Vec) -> IbcBasicResponse { /// IbcBasicResponse::new().add_messages(msgs) @@ -596,7 +596,7 @@ impl IbcBasicResponse { /// ## Examples /// /// ``` - /// use cosmwasm_std::{SubMsg, IbcBasicResponse}; + /// use secret_cosmwasm_std::{SubMsg, IbcBasicResponse}; /// /// fn make_response_with_submsgs(msgs: Vec) -> IbcBasicResponse { /// IbcBasicResponse::new().add_submessages(msgs) @@ -710,7 +710,7 @@ impl IbcReceiveResponse { /// ## Examples /// /// ``` - /// use cosmwasm_std::{attr, IbcReceiveResponse}; + /// use secret_cosmwasm_std::{attr, IbcReceiveResponse}; /// /// let attrs = vec![ /// ("action", "reaction"), @@ -733,7 +733,7 @@ impl IbcReceiveResponse { /// ## Examples /// /// ``` - /// use cosmwasm_std::{CosmosMsg, IbcReceiveResponse}; + /// use secret_cosmwasm_std::{CosmosMsg, IbcReceiveResponse}; /// /// fn make_response_with_msgs(msgs: Vec) -> IbcReceiveResponse { /// IbcReceiveResponse::new().add_messages(msgs) @@ -748,7 +748,7 @@ impl IbcReceiveResponse { /// ## Examples /// /// ``` - /// use cosmwasm_std::{SubMsg, IbcReceiveResponse}; + /// use secret_cosmwasm_std::{SubMsg, IbcReceiveResponse}; /// /// fn make_response_with_submsgs(msgs: Vec) -> IbcReceiveResponse { /// IbcReceiveResponse::new().add_submessages(msgs) diff --git a/packages/std/src/math/decimal.rs b/packages/std/src/math/decimal.rs index 72975e22e3..68a9046cbc 100644 --- a/packages/std/src/math/decimal.rs +++ b/packages/std/src/math/decimal.rs @@ -84,7 +84,7 @@ impl Decimal { /// ## Examples /// /// ``` - /// # use cosmwasm_std::{Decimal, Uint128}; + /// # use secret_cosmwasm_std::{Decimal, Uint128}; /// let a = Decimal::from_atomics(Uint128::new(1234), 3).unwrap(); /// assert_eq!(a.to_string(), "1.234"); /// @@ -165,7 +165,7 @@ impl Decimal { /// ## Examples /// /// ``` - /// # use cosmwasm_std::{Decimal, Uint128}; + /// # use secret_cosmwasm_std::{Decimal, Uint128}; /// # use std::str::FromStr; /// // Value with whole and fractional part /// let a = Decimal::from_str("1.234").unwrap(); diff --git a/packages/std/src/math/decimal256.rs b/packages/std/src/math/decimal256.rs index 0c2b134b5b..612e6dcfcc 100644 --- a/packages/std/src/math/decimal256.rs +++ b/packages/std/src/math/decimal256.rs @@ -94,7 +94,7 @@ impl Decimal256 { /// ## Examples /// /// ``` - /// # use cosmwasm_std::{Decimal256, Uint256}; + /// # use secret_cosmwasm_std::{Decimal256, Uint256}; /// let a = Decimal256::from_atomics(1234u64, 3).unwrap(); /// assert_eq!(a.to_string(), "1.234"); /// @@ -178,7 +178,7 @@ impl Decimal256 { /// ## Examples /// /// ``` - /// # use cosmwasm_std::{Decimal256, Uint256}; + /// # use secret_cosmwasm_std::{Decimal256, Uint256}; /// # use std::str::FromStr; /// // Value with whole and fractional part /// let a = Decimal256::from_str("1.234").unwrap(); diff --git a/packages/std/src/math/uint128.rs b/packages/std/src/math/uint128.rs index f6d8041184..3e1ec5908b 100644 --- a/packages/std/src/math/uint128.rs +++ b/packages/std/src/math/uint128.rs @@ -21,7 +21,7 @@ use crate::{ConversionOverflowError, Uint256, Uint64}; /// Use `from` to create instances of this and `u128` to get the value out: /// /// ``` -/// # use cosmwasm_std::Uint128; +/// # use secret_cosmwasm_std::Uint128; /// let a = Uint128::from(123u128); /// assert_eq!(a.u128(), 123); /// @@ -124,7 +124,7 @@ impl Uint128 { /// # Examples /// /// ``` - /// use cosmwasm_std::Uint128; + /// use secret_cosmwasm_std::Uint128; /// /// let a = Uint128::MAX; /// let result = a.full_mul(2u32); diff --git a/packages/std/src/math/uint256.rs b/packages/std/src/math/uint256.rs index 3469b1d80a..84aed2653d 100644 --- a/packages/std/src/math/uint256.rs +++ b/packages/std/src/math/uint256.rs @@ -37,7 +37,7 @@ use uints::U256; /// endian bytes: /// /// ``` -/// # use cosmwasm_std::Uint256; +/// # use secret_cosmwasm_std::Uint256; /// let a = Uint256::from(258u128); /// let b = Uint256::new([ /// 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, @@ -207,7 +207,7 @@ impl Uint256 { /// # Examples /// /// ``` - /// use cosmwasm_std::Uint256; + /// use secret_cosmwasm_std::Uint256; /// /// let a = Uint256::MAX; /// let result = a.full_mul(2u32); diff --git a/packages/std/src/math/uint512.rs b/packages/std/src/math/uint512.rs index fe7c1c7a2d..dc31b154c0 100644 --- a/packages/std/src/math/uint512.rs +++ b/packages/std/src/math/uint512.rs @@ -35,7 +35,7 @@ use uints::U512; /// endian bytes: /// /// ``` -/// # use cosmwasm_std::Uint512; +/// # use secret_cosmwasm_std::Uint512; /// let a = Uint512::from(258u128); /// let b = Uint512::new([ /// 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, diff --git a/packages/std/src/math/uint64.rs b/packages/std/src/math/uint64.rs index 57cf1154f4..cfacddb401 100644 --- a/packages/std/src/math/uint64.rs +++ b/packages/std/src/math/uint64.rs @@ -20,7 +20,7 @@ use crate::Uint128; /// Use `from` to create instances of this and `u64` to get the value out: /// /// ``` -/// # use cosmwasm_std::Uint64; +/// # use secret_cosmwasm_std::Uint64; /// let a = Uint64::from(42u64); /// assert_eq!(a.u64(), 42); /// @@ -120,7 +120,7 @@ impl Uint64 { /// # Examples /// /// ``` - /// use cosmwasm_std::Uint64; + /// use secret_cosmwasm_std::Uint64; /// /// let a = Uint64::MAX; /// let result = a.full_mul(2u32); diff --git a/packages/std/src/query/mod.rs b/packages/std/src/query/mod.rs index 00662717c0..be2cb9b81b 100644 --- a/packages/std/src/query/mod.rs +++ b/packages/std/src/query/mod.rs @@ -55,7 +55,7 @@ pub enum QueryRequest { /// # Examples /// /// ``` -/// # use cosmwasm_std::CustomQuery; +/// # use secret_cosmwasm_std::CustomQuery; /// # use schemars::JsonSchema; /// # use serde::{Deserialize, Serialize}; /// #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] diff --git a/packages/std/src/results/contract_result.rs b/packages/std/src/results/contract_result.rs index 5709b0684f..a27dcf2f02 100644 --- a/packages/std/src/results/contract_result.rs +++ b/packages/std/src/results/contract_result.rs @@ -15,7 +15,7 @@ use std::fmt; /// Success: /// /// ``` -/// # use cosmwasm_std::{to_vec, ContractResult, Response}; +/// # use secret_cosmwasm_std::{to_vec, ContractResult, Response}; /// let response: Response = Response::default(); /// let result: ContractResult = ContractResult::Ok(response); /// assert_eq!(to_vec(&result).unwrap(), br#"{"Ok":{"messages":[],"attributes":[],"events":[],"data":null}}"#); @@ -24,7 +24,7 @@ use std::fmt; /// Failure: /// /// ``` -/// # use cosmwasm_std::{to_vec, ContractResult, Response}; +/// # use secret_cosmwasm_std::{to_vec, ContractResult, Response}; /// let error_msg = String::from("Something went wrong"); /// let result: ContractResult = ContractResult::Err(error_msg); /// assert_eq!(to_vec(&result).unwrap(), br#"{"Err":"Something went wrong"}"#); diff --git a/packages/std/src/results/response.rs b/packages/std/src/results/response.rs index 097fe49fc2..70d82934d4 100644 --- a/packages/std/src/results/response.rs +++ b/packages/std/src/results/response.rs @@ -16,10 +16,10 @@ use super::{Attribute, CosmosMsg, Empty, Event, SubMsg}; /// Direct: /// /// ``` -/// # use cosmwasm_std::{Binary, DepsMut, Env, MessageInfo}; +/// # use secret_cosmwasm_std::{Binary, DepsMut, Env, MessageInfo}; /// # type InstantiateMsg = (); /// # -/// use cosmwasm_std::{attr, Response, StdResult}; +/// use secret_cosmwasm_std::{attr, Response, StdResult}; /// /// pub fn instantiate( /// deps: DepsMut, @@ -36,11 +36,11 @@ use super::{Attribute, CosmosMsg, Empty, Event, SubMsg}; /// Mutating: /// /// ``` -/// # use cosmwasm_std::{coins, BankMsg, Binary, DepsMut, Env, MessageInfo, SubMsg}; +/// # use secret_cosmwasm_std::{coins, BankMsg, Binary, DepsMut, Env, MessageInfo, SubMsg}; /// # type InstantiateMsg = (); /// # type MyError = (); /// # -/// use cosmwasm_std::Response; +/// use secret_cosmwasm_std::Response; /// /// pub fn instantiate( /// deps: DepsMut, @@ -155,7 +155,7 @@ impl Response { /// Adding a list of attributes using the pair notation for key and value: /// /// ``` - /// use cosmwasm_std::Response; + /// use secret_cosmwasm_std::Response; /// /// let attrs = vec![ /// ("action", "reaction"), @@ -169,7 +169,7 @@ impl Response { /// Adding an optional value as an optional attribute by turning it into a list of 0 or 1 elements: /// /// ``` - /// use cosmwasm_std::{Attribute, Response}; + /// use secret_cosmwasm_std::{Attribute, Response}; /// /// // Some value /// let value: Option = Some("sarah".to_string()); @@ -200,7 +200,7 @@ impl Response { /// ## Examples /// /// ``` - /// use cosmwasm_std::{CosmosMsg, Response}; + /// use secret_cosmwasm_std::{CosmosMsg, Response}; /// /// fn make_response_with_msgs(msgs: Vec) -> Response { /// Response::new().add_messages(msgs) @@ -215,7 +215,7 @@ impl Response { /// ## Examples /// /// ``` - /// use cosmwasm_std::{SubMsg, Response}; + /// use secret_cosmwasm_std::{SubMsg, Response}; /// /// fn make_response_with_submsgs(msgs: Vec) -> Response { /// Response::new().add_submessages(msgs) diff --git a/packages/std/src/results/submessages.rs b/packages/std/src/results/submessages.rs index 04e22acd16..fb28591b5c 100644 --- a/packages/std/src/results/submessages.rs +++ b/packages/std/src/results/submessages.rs @@ -73,7 +73,7 @@ impl SubMsg { /// ## Examples /// /// ``` - /// # use cosmwasm_std::{coins, BankMsg, ReplyOn, SubMsg}; + /// # use secret_cosmwasm_std::{coins, BankMsg, ReplyOn, SubMsg}; /// # let msg = BankMsg::Send { to_address: String::from("you"), amount: coins(1015, "earth") }; /// let sub_msg: SubMsg = SubMsg::reply_always(msg, 1234).with_gas_limit(60_000); /// assert_eq!(sub_msg.id, 1234); @@ -120,7 +120,7 @@ pub struct Reply { /// Success: /// /// ``` -/// # use cosmwasm_std::{to_vec, Binary, Event, SubMsgResponse, SubMsgResult}; +/// # use secret_cosmwasm_std::{to_vec, Binary, Event, SubMsgResponse, SubMsgResult}; /// let response = SubMsgResponse { /// data: Some(Binary::from_base64("MTIzCg==").unwrap()), /// events: vec![Event::new("wasm").add_attribute("fo", "ba")], @@ -132,7 +132,7 @@ pub struct Reply { /// Failure: /// /// ``` -/// # use cosmwasm_std::{to_vec, SubMsgResult, Response}; +/// # use secret_cosmwasm_std::{to_vec, SubMsgResult, Response}; /// let error_msg = String::from("Something went wrong"); /// let result = SubMsgResult::Err(error_msg); /// assert_eq!(to_vec(&result).unwrap(), br#"{"error":"Something went wrong"}"#); diff --git a/packages/std/src/results/system_result.rs b/packages/std/src/results/system_result.rs index fbef7a6422..6056cd347d 100644 --- a/packages/std/src/results/system_result.rs +++ b/packages/std/src/results/system_result.rs @@ -15,7 +15,7 @@ use super::super::errors::SystemError; /// Success: /// /// ``` -/// # use cosmwasm_std::{to_vec, Binary, ContractResult, SystemResult}; +/// # use secret_cosmwasm_std::{to_vec, Binary, ContractResult, SystemResult}; /// let data = Binary::from(b"hello, world"); /// let result = SystemResult::Ok(ContractResult::Ok(data)); /// assert_eq!(to_vec(&result).unwrap(), br#"{"Ok":{"Ok":"aGVsbG8sIHdvcmxk"}}"#); @@ -24,7 +24,7 @@ use super::super::errors::SystemError; /// Failure: /// /// ``` -/// # use cosmwasm_std::{to_vec, Binary, ContractResult, SystemResult, SystemError}; +/// # use secret_cosmwasm_std::{to_vec, Binary, ContractResult, SystemResult, SystemError}; /// let error = SystemError::Unknown {}; /// let result: SystemResult = SystemResult::Err(error); /// assert_eq!(to_vec(&result).unwrap(), br#"{"Err":{"unknown":{}}}"#); diff --git a/packages/std/src/testing/mock.rs b/packages/std/src/testing/mock.rs index 2aa611d2d6..9931259995 100644 --- a/packages/std/src/testing/mock.rs +++ b/packages/std/src/testing/mock.rs @@ -174,7 +174,7 @@ impl Api for MockApi { signature: &[u8], public_key: &[u8], ) -> Result { - Ok(cosmwasm_crypto::secp256k1_verify( + Ok(secret_cosmwasm_crypto::secp256k1_verify( message_hash, signature, public_key, @@ -188,7 +188,7 @@ impl Api for MockApi { recovery_param: u8, ) -> Result, RecoverPubkeyError> { let pubkey = - cosmwasm_crypto::secp256k1_recover_pubkey(message_hash, signature, recovery_param)?; + secret_cosmwasm_crypto::secp256k1_recover_pubkey(message_hash, signature, recovery_param)?; Ok(pubkey.to_vec()) } @@ -198,7 +198,7 @@ impl Api for MockApi { signature: &[u8], public_key: &[u8], ) -> Result { - Ok(cosmwasm_crypto::ed25519_verify( + Ok(secret_cosmwasm_crypto::ed25519_verify( message, signature, public_key, )?) } @@ -209,7 +209,7 @@ impl Api for MockApi { signatures: &[&[u8]], public_keys: &[&[u8]], ) -> Result { - Ok(cosmwasm_crypto::ed25519_batch_verify( + Ok(secret_cosmwasm_crypto::ed25519_batch_verify( messages, signatures, public_keys, @@ -221,11 +221,11 @@ impl Api for MockApi { } fn secp256k1_sign(&self, message: &[u8], private_key: &[u8]) -> Result, SigningError> { - Ok(cosmwasm_crypto::secp256k1_sign(message, private_key)?) + Ok(secret_cosmwasm_crypto::secp256k1_sign(message, private_key)?) } fn ed25519_sign(&self, message: &[u8], private_key: &[u8]) -> Result, SigningError> { - Ok(cosmwasm_crypto::ed25519_sign(message, private_key)?) + Ok(secret_cosmwasm_crypto::ed25519_sign(message, private_key)?) } fn check_gas(&self) -> StdResult { @@ -1544,7 +1544,7 @@ mod tests { }); match result { SystemResult::Ok(ContractResult::Err(err)) => { - assert_eq!(err, "Error parsing into type cosmwasm_std::testing::mock::tests::wasm_querier_works::{{closure}}::MyMsg: Invalid type") + assert_eq!(err, "Error parsing into type secret_cosmwasm_std::testing::mock::tests::wasm_querier_works::{{closure}}::MyMsg: Invalid type") } res => panic!("Unexpected result: {:?}", res), } diff --git a/packages/std/src/timestamp.rs b/packages/std/src/timestamp.rs index fa96fb477c..c562e7cdeb 100644 --- a/packages/std/src/timestamp.rs +++ b/packages/std/src/timestamp.rs @@ -11,7 +11,7 @@ use crate::math::Uint64; /// ## Examples /// /// ``` -/// # use cosmwasm_std::Timestamp; +/// # use secret_cosmwasm_std::Timestamp; /// let ts = Timestamp::from_nanos(1_000_000_202); /// assert_eq!(ts.nanos(), 1_000_000_202); /// assert_eq!(ts.seconds(), 1); diff --git a/packages/std/src/traits.rs b/packages/std/src/traits.rs index 4af1b54894..567b9d2187 100644 --- a/packages/std/src/traits.rs +++ b/packages/std/src/traits.rs @@ -88,8 +88,8 @@ pub trait Api { /// ## Examples /// /// ``` - /// # use cosmwasm_std::{Api, Addr}; - /// # use cosmwasm_std::testing::MockApi; + /// # use secret_cosmwasm_std::{Api, Addr}; + /// # use secret_cosmwasm_std::testing::MockApi; /// # let api = MockApi::default(); /// let input = "what-users-provide"; /// let validated: Addr = api.addr_validate(input).unwrap(); diff --git a/packages/std/src/types.rs b/packages/std/src/types.rs index 936e84d85c..5d3b91633c 100644 --- a/packages/std/src/types.rs +++ b/packages/std/src/types.rs @@ -43,7 +43,7 @@ pub struct BlockInfo { /// Using chrono: /// /// ``` - /// # use cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; + /// # use secret_cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; /// # let env = Env { /// # block: BlockInfo { /// # height: 12_345, @@ -58,7 +58,7 @@ pub struct BlockInfo { /// # }; /// # extern crate chrono; /// use chrono::NaiveDateTime; - /// use cosmwasm_std::Binary; + /// use secret_cosmwasm_std::Binary; /// let seconds = env.block.time.seconds(); /// let nsecs = env.block.time.subsec_nanos(); /// let dt = NaiveDateTime::from_timestamp(seconds as i64, nsecs as u32); @@ -67,8 +67,8 @@ pub struct BlockInfo { /// Creating a simple millisecond-precision timestamp (as used in JavaScript): /// /// ``` - /// # use cosmwasm_std::Binary; - /// # use cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; + /// # use secret_cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; + /// # use secret_cosmwasm_std::Binary; /// # let env = Env { /// # block: BlockInfo { /// # height: 12_345, diff --git a/packages/storage-compat/Cargo.toml b/packages/storage-compat/Cargo.toml new file mode 100644 index 0000000000..eea0473499 --- /dev/null +++ b/packages/storage-compat/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "cosmwasm-storage" +version = "1.1.9" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[features] +default = [] +# This enables iterator functionality, as exposed in cosmwasm-std/iterator +iterator = ["secret-cosmwasm-storage/iterator"] + +[dependencies] +secret-cosmwasm-storage = { path = "../storage" } diff --git a/packages/storage-compat/src/lib.rs b/packages/storage-compat/src/lib.rs new file mode 100644 index 0000000000..51171f1f9b --- /dev/null +++ b/packages/storage-compat/src/lib.rs @@ -0,0 +1 @@ +pub use secret_cosmwasm_storage::*; diff --git a/packages/storage/Cargo.toml b/packages/storage/Cargo.toml index 23eb317e03..2494262bb5 100644 --- a/packages/storage/Cargo.toml +++ b/packages/storage/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cosmwasm-storage" +name = "secret-cosmwasm-storage" version = "1.1.9" authors = [ "Ethan Frey ", @@ -15,11 +15,11 @@ readme = "README.md" [features] default = [] # This enables iterator functionality, as exposed in cosmwasm-std/iterator -iterator = ["cosmwasm-std/iterator"] +iterator = ["secret-cosmwasm-std/iterator"] [dependencies] # Uses the path when built locally; uses the given version from crates.io when published -cosmwasm-std = { version = "1.1.9", path = "../std", default-features = false } +secret-cosmwasm-std = { version = "1.1.9", path = "../std", default-features = false } serde = { version = "1.0.103", default-features = false, features = [ "derive", "alloc", diff --git a/packages/storage/src/bucket.rs b/packages/storage/src/bucket.rs index dd9e482f3e..738048a472 100644 --- a/packages/storage/src/bucket.rs +++ b/packages/storage/src/bucket.rs @@ -1,9 +1,9 @@ use serde::{de::DeserializeOwned, ser::Serialize}; use std::marker::PhantomData; -use cosmwasm_std::{to_vec, StdError, StdResult, Storage}; +use crate::cosmwasm_std::{to_vec, StdError, StdResult, Storage}; #[cfg(feature = "iterator")] -use cosmwasm_std::{Order, Record}; +use crate::cosmwasm_std::{Order, Record}; use crate::length_prefixed::{to_length_prefixed, to_length_prefixed_nested}; #[cfg(feature = "iterator")] @@ -169,8 +169,8 @@ where #[cfg(test)] mod tests { use super::*; - use cosmwasm_std::testing::MockStorage; - use cosmwasm_std::StdError; + use secret_cosmwasm_std::testing::MockStorage; + use secret_cosmwasm_std::StdError; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)] diff --git a/packages/storage/src/lib.rs b/packages/storage/src/lib.rs index 486d070796..30449920a3 100644 --- a/packages/storage/src/lib.rs +++ b/packages/storage/src/lib.rs @@ -6,6 +6,8 @@ mod sequence; mod singleton; mod type_helpers; +use secret_cosmwasm_std as cosmwasm_std; + pub use bucket::{bucket, bucket_read, Bucket, ReadonlyBucket}; pub use length_prefixed::{to_length_prefixed, to_length_prefixed_nested}; pub use prefixed_storage::{prefixed, prefixed_read, PrefixedStorage, ReadonlyPrefixedStorage}; diff --git a/packages/storage/src/namespace_helpers.rs b/packages/storage/src/namespace_helpers.rs index 1c2650b911..37a4fe693b 100644 --- a/packages/storage/src/namespace_helpers.rs +++ b/packages/storage/src/namespace_helpers.rs @@ -1,6 +1,6 @@ -use cosmwasm_std::Storage; +use crate::cosmwasm_std::Storage; #[cfg(feature = "iterator")] -use cosmwasm_std::{Order, Record}; +use crate::cosmwasm_std::{Order, Record}; pub(crate) fn get_with_prefix( storage: &dyn Storage, @@ -86,7 +86,7 @@ fn namespace_upper_bound(input: &[u8]) -> Vec { mod tests { use super::*; use crate::length_prefixed::to_length_prefixed; - use cosmwasm_std::testing::MockStorage; + use crate::cosmwasm_std::testing::MockStorage; #[test] fn prefix_get_set() { diff --git a/packages/storage/src/prefixed_storage.rs b/packages/storage/src/prefixed_storage.rs index 6d7779541a..b82beb0d02 100644 --- a/packages/storage/src/prefixed_storage.rs +++ b/packages/storage/src/prefixed_storage.rs @@ -1,6 +1,6 @@ -use cosmwasm_std::Storage; +use crate::cosmwasm_std::Storage; #[cfg(feature = "iterator")] -use cosmwasm_std::{Order, Record}; +use crate::cosmwasm_std::{Order, Record}; use crate::length_prefixed::{to_length_prefixed, to_length_prefixed_nested}; #[cfg(feature = "iterator")] @@ -120,7 +120,7 @@ impl<'a> Storage for ReadonlyPrefixedStorage<'a> { #[cfg(test)] mod tests { use super::*; - use cosmwasm_std::testing::MockStorage; + use crate::cosmwasm_std::testing::MockStorage; #[test] fn prefixed_storage_set_and_get() { diff --git a/packages/storage/src/sequence.rs b/packages/storage/src/sequence.rs index 30f9491cb2..84fee76b0c 100644 --- a/packages/storage/src/sequence.rs +++ b/packages/storage/src/sequence.rs @@ -1,4 +1,4 @@ -use cosmwasm_std::{StdResult, Storage}; +use crate::cosmwasm_std::{StdResult, Storage}; use crate::Singleton; @@ -24,7 +24,7 @@ pub fn nextval(seq: &mut Singleton) -> StdResult { #[cfg(test)] mod tests { use super::*; - use cosmwasm_std::testing::MockStorage; + use crate::cosmwasm_std::testing::MockStorage; #[test] fn walk_through_sequence() { diff --git a/packages/storage/src/singleton.rs b/packages/storage/src/singleton.rs index 782002b976..c201c93e1f 100644 --- a/packages/storage/src/singleton.rs +++ b/packages/storage/src/singleton.rs @@ -1,7 +1,7 @@ use serde::{de::DeserializeOwned, ser::Serialize}; use std::marker::PhantomData; -use cosmwasm_std::{to_vec, StdError, StdResult, Storage}; +use crate::cosmwasm_std::{to_vec, StdError, StdResult, Storage}; use crate::length_prefixed::to_length_prefixed; use crate::type_helpers::{may_deserialize, must_deserialize}; @@ -128,10 +128,10 @@ where #[cfg(test)] mod tests { use super::*; - use cosmwasm_std::testing::MockStorage; + use crate::cosmwasm_std::testing::MockStorage; use serde::{Deserialize, Serialize}; - use cosmwasm_std::{OverflowError, OverflowOperation, StdError}; + use crate::cosmwasm_std::{OverflowError, OverflowOperation, StdError}; #[derive(Serialize, Deserialize, PartialEq, Debug)] struct Config { diff --git a/packages/storage/src/type_helpers.rs b/packages/storage/src/type_helpers.rs index 6a36f074e2..2e32672faa 100644 --- a/packages/storage/src/type_helpers.rs +++ b/packages/storage/src/type_helpers.rs @@ -2,8 +2,8 @@ use serde::de::DeserializeOwned; use std::any::type_name; #[cfg(feature = "iterator")] -use cosmwasm_std::Record; -use cosmwasm_std::{from_slice, StdError, StdResult}; +use crate::cosmwasm_std::Record; +use crate::cosmwasm_std::{from_slice, StdError, StdResult}; /// may_deserialize parses json bytes from storage (Option), returning Ok(None) if no data present /// @@ -36,7 +36,7 @@ pub(crate) fn deserialize_kv(kv: Record>) -> StdRes #[cfg(test)] mod tests { use super::*; - use cosmwasm_std::{to_vec, StdError}; + use crate::cosmwasm_std::{to_vec, StdError}; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -81,7 +81,7 @@ mod tests { let parsed = must_deserialize::(&None); match parsed.unwrap_err() { StdError::NotFound { kind, .. } => { - assert_eq!(kind, "cosmwasm_storage::type_helpers::tests::Person") + assert_eq!(kind, "secret_cosmwasm_storage::type_helpers::tests::Person") } e => panic!("Unexpected error {}", e), }