From c1d8cafabd1669d1d78ba10e1d05c3338004d872 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Thu, 21 Nov 2024 09:09:25 +0000 Subject: [PATCH 01/25] Invert order of vec --- .../src/objects/account/account_trace.rs | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 9603d6238..3a52bba25 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -174,12 +174,11 @@ impl AccountTrace { let acc = if trace == LOCAL { Self::Local } else { - Self::Remote( - trace - .split(CHAIN_DELIMITER) - .map(TruncatedChainId::_from_str) - .collect(), - ) + let rev_trace: Vec<_> = trace + .split(CHAIN_DELIMITER) + .map(TruncatedChainId::_from_str) + .collect(); + Self::Remote(rev_trace.into_iter().rev().collect()) }; acc.verify()?; Ok(acc) @@ -190,15 +189,7 @@ impl TryFrom<&str> for AccountTrace { type Error = AbstractError; fn try_from(trace: &str) -> Result { - if trace == LOCAL { - Ok(Self::Local) - } else { - let chain_trace: Vec = trace - .split(CHAIN_DELIMITER) - .map(|t| TruncatedChainId::from_string(t.to_string())) - .collect::, _>>()?; - Ok(Self::Remote(chain_trace)) - } + AccountTrace::from_str(trace) } } @@ -212,6 +203,7 @@ impl Display for AccountTrace { // "juno>terra>osmosis" chain_name .iter() + .rev() .map(|name| name.as_str()) .collect::>() .join(CHAIN_DELIMITER) @@ -255,25 +247,29 @@ mod test { #[coverage_helper::test] fn remote_multi_works() { + // Here the account originates from ethereum and was then bridged to bitcoin let trace = AccountTrace::from_str("bitcoin>ethereum").unwrap(); assert_eq!( trace, + // The trace vector pushes the last chains last AccountTrace::Remote(vec![ + TruncatedChainId::from_str("ethereum").unwrap(), TruncatedChainId::from_str("bitcoin").unwrap(), - TruncatedChainId::from_str("ethereum").unwrap() ]) ); } #[coverage_helper::test] fn remote_multi_multi_works() { + // Here the account originates from cosmos, and was then bridged to ethereum and was then bridged to bitcoin let trace = AccountTrace::from_str("bitcoin>ethereum>cosmos").unwrap(); assert_eq!( trace, + // The trace vector pushes the last chains last AccountTrace::Remote(vec![ - TruncatedChainId::from_str("bitcoin").unwrap(), - TruncatedChainId::from_str("ethereum").unwrap(), TruncatedChainId::from_str("cosmos").unwrap(), + TruncatedChainId::from_str("ethereum").unwrap(), + TruncatedChainId::from_str("bitcoin").unwrap(), ]) ); } From 463cacf58816bf47dbdb7376b0762766b5dc2d30 Mon Sep 17 00:00:00 2001 From: Buckram Date: Thu, 21 Nov 2024 11:30:24 +0200 Subject: [PATCH 02/25] collect trace from string in single iteration --- .../abstract-std/src/objects/account/account_trace.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 3a52bba25..4d3aba824 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -175,10 +175,12 @@ impl AccountTrace { Self::Local } else { let rev_trace: Vec<_> = trace - .split(CHAIN_DELIMITER) + // DoubleEndedSearcher implemented for char, but not for "str" + .split(CHAIN_DELIMITER.chars().next().unwrap()) .map(TruncatedChainId::_from_str) + .rev() .collect(); - Self::Remote(rev_trace.into_iter().rev().collect()) + Self::Remote(rev_trace) }; acc.verify()?; Ok(acc) From 2ad544f7d6e4bfc06277d4756f53e7985e80c425 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Fri, 22 Nov 2024 09:12:57 +0000 Subject: [PATCH 03/25] account trace parsing funtion --- .../src/objects/account/account_trace.rs | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 3a52bba25..3506dbb94 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -153,33 +153,12 @@ impl AccountTrace { /// /// **only use this for deserialization** pub(crate) fn from_string(trace: String) -> Self { - let acc = if trace == LOCAL { - Self::Local - } else { - Self::Remote( - trace - .split(CHAIN_DELIMITER) - .map(TruncatedChainId::_from_str) - .collect(), - ) - }; - acc + account_trace_from_str(&trace) } - /// **No verification is done here** - /// - /// **only use this for deserialization** #[allow(unused)] pub(crate) fn from_str(trace: &str) -> Result { - let acc = if trace == LOCAL { - Self::Local - } else { - let rev_trace: Vec<_> = trace - .split(CHAIN_DELIMITER) - .map(TruncatedChainId::_from_str) - .collect(); - Self::Remote(rev_trace.into_iter().rev().collect()) - }; + let acc = account_trace_from_str(trace); acc.verify()?; Ok(acc) } @@ -193,6 +172,18 @@ impl TryFrom<&str> for AccountTrace { } } +fn account_trace_from_str(trace: &str) -> AccountTrace { + if trace == LOCAL { + AccountTrace::Local + } else { + let rev_trace: Vec<_> = trace + .split(CHAIN_DELIMITER) + .map(TruncatedChainId::_from_str) + .collect(); + AccountTrace::Remote(rev_trace.into_iter().rev().collect()) + } +} + impl Display for AccountTrace { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { From 34dd4903d3c1762b1f7cf9341c9203af47d563da Mon Sep 17 00:00:00 2001 From: Kayanski Date: Fri, 22 Nov 2024 09:15:14 +0000 Subject: [PATCH 04/25] Removed unused --- .../packages/abstract-std/src/objects/account/account_trace.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index fb699fab9..49fa0e6cd 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -156,7 +156,6 @@ impl AccountTrace { account_trace_from_str(&trace) } - #[allow(unused)] pub(crate) fn from_str(trace: &str) -> Result { let acc = account_trace_from_str(trace); acc.verify()?; From b49de9b3b19f931838b09a543b6b06e3c8056e80 Mon Sep 17 00:00:00 2001 From: Buckram Date: Fri, 22 Nov 2024 15:20:25 +0200 Subject: [PATCH 05/25] add minimal snapshot test for multihop account --- framework/Cargo.lock | 389 +++++++++++------- .../contracts/native/ibc-client/Cargo.toml | 2 +- .../contracts/native/ibc-client/src/ibc.rs | 3 +- .../ibc-client/tests/multihop_accounts.rs | 94 +++++ .../multihop_accounts__multihop_account.snap | 17 + 5 files changed, 358 insertions(+), 147 deletions(-) create mode 100644 framework/contracts/native/ibc-client/tests/multihop_accounts.rs create mode 100644 framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap diff --git a/framework/Cargo.lock b/framework/Cargo.lock index 657eeb146..5f46295c7 100644 --- a/framework/Cargo.lock +++ b/framework/Cargo.lock @@ -256,7 +256,7 @@ dependencies = [ "cw-storage-plus", "cw-utils", "cw2", - "ibc-proto", + "ibc-proto 0.47.1", "prost", "semver", "serde", @@ -566,7 +566,7 @@ dependencies = [ "cw2", "cw20", "doc-comment", - "ibc-proto", + "ibc-proto 0.47.1", "prost-types", "schemars", "semver", @@ -797,7 +797,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -813,7 +813,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "syn-solidity", "tiny-keccak", ] @@ -829,7 +829,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "syn-solidity", ] @@ -1085,7 +1085,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1107,7 +1107,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1118,7 +1118,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1203,7 +1203,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower 0.5.1", "tower-layer", "tower-service", @@ -1241,7 +1241,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] @@ -1614,7 +1614,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1653,9 +1653,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" dependencies = [ "cfg-if", "cpufeatures", @@ -1712,6 +1712,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1761,6 +1771,19 @@ dependencies = [ "tendermint-proto 0.39.1", ] +[[package]] +name = "cosmos-sdk-proto" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "462e1f6a8e005acc8835d32d60cbd7973ed65ea2a8d8473830e675f050956427" +dependencies = [ + "informalsystems-pbjson", + "prost", + "serde", + "tendermint-proto 0.40.0", + "tonic", +] + [[package]] name = "cosmrs" version = "0.19.0" @@ -1840,7 +1863,7 @@ checksum = "1b5658b1dc64e10b56ae7a449f678f96932a96f6cfad1769d608d1d1d656480a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1864,7 +1887,7 @@ checksum = "c8ef1b5835a65fcca3ab8b9a02b4f4dacc78e233a5c2f20b270efb9db0666d12" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1898,9 +1921,9 @@ checksum = "8174551717bb3d1e75935e38d33f5f8ee8f680dd8dd42c90851e6c644faad14e" [[package]] name = "cpufeatures" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -2000,7 +2023,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2131,7 +2154,7 @@ checksum = "bad52865e313bb7ed3f3938f7ad9d566e430fb6143a63476c22bed505ea78cd7" dependencies = [ "convert_case 0.6.0", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2210,7 +2233,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2221,7 +2244,7 @@ checksum = "85806182382aef051a318b9abb41af559e6d7733fbba3c04c42ed23cc03d8e1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2729,7 +2752,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2751,7 +2774,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2849,7 +2872,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2869,7 +2892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core 0.20.2", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2882,7 +2905,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2902,7 +2925,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "unicode-xid", ] @@ -3018,7 +3041,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3426,7 +3449,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3540,9 +3563,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -3815,14 +3838,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -3844,7 +3867,7 @@ dependencies = [ "futures-util", "headers", "http 1.1.0", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-util", "pin-project-lite", @@ -3876,11 +3899,11 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "log", "rustls 0.23.17", - "rustls-native-certs 0.8.0", + "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -3893,7 +3916,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -3908,7 +3931,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -3927,7 +3950,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.5.0", + "hyper 1.5.1", "pin-project-lite", "socket2", "tokio", @@ -3960,22 +3983,22 @@ dependencies = [ [[package]] name = "ibc-chain-registry" -version = "0.29.3" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b986be2aafa8dfaa2bc4dc1e8320615b853798a23cbb2f5141e04410422d66e" +checksum = "75220fc035b41ba7d094f90ee2deb9cb63c3a9ae0698e30396a7035110325c24" dependencies = [ "async-trait", "flex-error", "futures", "http 1.1.0", - "ibc-proto", + "ibc-proto 0.51.1", "ibc-relayer", "ibc-relayer-types", "itertools 0.13.0", "reqwest 0.11.27", "serde", "serde_json", - "tendermint-rpc 0.38.1", + "tendermint-rpc 0.40.0", "tokio", "tracing", ] @@ -3998,11 +4021,30 @@ dependencies = [ "tonic", ] +[[package]] +name = "ibc-proto" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b70f517162e74e2d35875b8b94bf4d1e45f2c69ef3de452dc855944455d33ca" +dependencies = [ + "base64 0.22.1", + "bytes", + "cosmos-sdk-proto 0.26.1", + "flex-error", + "ics23", + "informalsystems-pbjson", + "prost", + "serde", + "subtle-encoding", + "tendermint-proto 0.40.0", + "tonic", +] + [[package]] name = "ibc-relayer" -version = "0.29.3" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c476e68cbc686885bdf392162a47f4d122e1c129cf71bdfad7da7c0f478083e6" +checksum = "cef30a6f00e21d77ad61b6809de404f59cd3b6d9b31699f0ebd238539a33da46" dependencies = [ "anyhow", "async-stream", @@ -4025,7 +4067,7 @@ dependencies = [ "http 1.1.0", "humantime", "humantime-serde", - "ibc-proto", + "ibc-proto 0.51.1", "ibc-relayer-types", "ibc-telemetry", "itertools 0.13.0", @@ -4047,12 +4089,12 @@ dependencies = [ "signature", "strum", "subtle-encoding", - "tendermint 0.38.1", + "tendermint 0.40.0", "tendermint-light-client", "tendermint-light-client-detector", "tendermint-light-client-verifier", - "tendermint-proto 0.38.1", - "tendermint-rpc 0.38.1", + "tendermint-proto 0.40.0", + "tendermint-rpc 0.40.0", "thiserror", "tiny-bip39", "tiny-keccak", @@ -4067,14 +4109,14 @@ dependencies = [ [[package]] name = "ibc-relayer-types" -version = "0.29.3" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73841980ed06deeca409245f7a94c25bcec058893435f0a8941542d47c7e7089" +checksum = "3bcdf481e452b36076f2bc2899b21a6e58fb8c5ab773ef0631fb4df2ac2e4de0" dependencies = [ "bytes", "derive_more 0.99.18", "flex-error", - "ibc-proto", + "ibc-proto 0.51.1", "ics23", "itertools 0.13.0", "num-rational", @@ -4085,9 +4127,9 @@ dependencies = [ "serde_derive", "serde_json", "subtle-encoding", - "tendermint 0.38.1", + "tendermint 0.40.0", "tendermint-light-client-verifier", - "tendermint-proto 0.38.1", + "tendermint-proto 0.40.0", "time", "tracing", "uint", @@ -4095,9 +4137,9 @@ dependencies = [ [[package]] name = "ibc-telemetry" -version = "0.29.3" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a1a80117aa7892e25455e1f9709f0436b54fe39f584fb6e67d2c99e814b121" +checksum = "136f35f27cc543fc7e2cd83481abe59bae92e82e496074bb01e8c0efbcccb22e" dependencies = [ "axum 0.6.20", "dashmap", @@ -4109,7 +4151,7 @@ dependencies = [ "prometheus", "serde", "serde_json", - "tendermint 0.38.1", + "tendermint 0.40.0", "tokio", "tracing", ] @@ -4248,7 +4290,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4377,9 +4419,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "js-sys" @@ -4490,7 +4532,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-http-proxy", "hyper-rustls 0.27.3", "hyper-timeout", @@ -4542,7 +4584,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4770,7 +4812,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -4928,7 +4970,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5177,7 +5219,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5221,7 +5263,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5250,7 +5292,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5369,9 +5411,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -5425,7 +5467,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5651,11 +5693,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-tls", "hyper-util", @@ -5671,7 +5713,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration 0.6.1", "tokio", "tokio-native-tls", @@ -5809,7 +5851,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.87", + "syn 2.0.89", "walkdir", ] @@ -5847,9 +5889,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.40" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -5908,7 +5950,7 @@ dependencies = [ "openssl-probe", "rustls-pemfile 1.0.4", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] @@ -5921,20 +5963,19 @@ dependencies = [ "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] name = "rustls-native-certs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.0.1", ] [[package]] @@ -6015,9 +6056,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -6043,7 +6084,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6134,7 +6175,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -6223,7 +6277,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6234,7 +6288,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6267,7 +6321,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6504,7 +6558,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6541,9 +6595,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -6559,7 +6613,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6570,9 +6624,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -6585,7 +6639,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6595,7 +6649,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.5.0", ] @@ -6606,7 +6660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -6711,17 +6765,33 @@ dependencies = [ ] [[package]] -name = "tendermint-config" -version = "0.38.1" +name = "tendermint" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" +checksum = "37d513ce7f9e41c67ab2dd3d554ef65f36fbcc61745af1e1f93eafdeefa1ce37" dependencies = [ + "bytes", + "digest 0.10.7", + "ed25519", + "ed25519-consensus", "flex-error", + "futures", + "k256", + "num-traits", + "once_cell", + "prost", + "ripemd", "serde", + "serde_bytes", "serde_json", - "tendermint 0.38.1", - "toml", - "url", + "serde_repr", + "sha2 0.10.8", + "signature", + "subtle", + "subtle-encoding", + "tendermint-proto 0.40.0", + "time", + "zeroize", ] [[package]] @@ -6738,11 +6808,25 @@ dependencies = [ "url", ] +[[package]] +name = "tendermint-config" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de4e66e78c6bfb768993e69c4fc5333dbc863f6d54ebd7a5d08d91556768087" +dependencies = [ + "flex-error", + "serde", + "serde_json", + "tendermint 0.40.0", + "toml", + "url", +] + [[package]] name = "tendermint-light-client" -version = "0.38.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91e5abb448c65e8abdfe0e17a3a189e005a71b4169b89f36aaa2053ff239577" +checksum = "3e88c08a112db05101396a79f71c017d7dbf548dc21614f82251f17ecbe5d5e8" dependencies = [ "contracts", "crossbeam-channel", @@ -6755,9 +6839,9 @@ dependencies = [ "serde_derive", "serde_json", "static_assertions", - "tendermint 0.38.1", + "tendermint 0.40.0", "tendermint-light-client-verifier", - "tendermint-rpc 0.38.1", + "tendermint-rpc 0.40.0", "time", "tokio", "tracing", @@ -6765,9 +6849,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-detector" -version = "0.38.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1ac1607eb7a3393313558b339c36eebeba15aa7f2d101d1d47299e65825152" +checksum = "d48a431ea923182c37ca9f3cc8333490ac6746a64520d1c4a3dd18c08b0806ac" dependencies = [ "crossbeam-channel", "derive_more 0.99.18", @@ -6778,24 +6862,24 @@ dependencies = [ "serde_derive", "serde_json", "static_assertions", - "tendermint 0.38.1", + "tendermint 0.40.0", "tendermint-light-client", - "tendermint-proto 0.38.1", - "tendermint-rpc 0.38.1", + "tendermint-proto 0.40.0", + "tendermint-rpc 0.40.0", "time", "tracing", ] [[package]] name = "tendermint-light-client-verifier" -version = "0.38.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" +checksum = "7affc5fffe9df158185e15bce3e47fc3a0c901e6708f3b7d33f0867d7aef8ce1" dependencies = [ "derive_more 0.99.18", "flex-error", "serde", - "tendermint 0.38.1", + "tendermint 0.40.0", "time", ] @@ -6830,14 +6914,28 @@ dependencies = [ "time", ] +[[package]] +name = "tendermint-proto" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c81ba1b023ec00763c3bc4f4376c67c0047f185cccf95c416c7a2f16272c4cbb" +dependencies = [ + "bytes", + "flex-error", + "prost", + "serde", + "serde_bytes", + "subtle-encoding", + "time", +] + [[package]] name = "tendermint-rpc" -version = "0.38.1" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" +checksum = "9693f42544bf3b41be3cbbfa418650c86e137fb8f5a57981659a84b677721ecf" dependencies = [ "async-trait", - "async-tungstenite", "bytes", "flex-error", "futures", @@ -6852,9 +6950,9 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint 0.38.1", - "tendermint-config 0.38.1", - "tendermint-proto 0.38.1", + "tendermint 0.39.1", + "tendermint-config 0.39.1", + "tendermint-proto 0.39.1", "thiserror", "time", "tokio", @@ -6866,11 +6964,12 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.39.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9693f42544bf3b41be3cbbfa418650c86e137fb8f5a57981659a84b677721ecf" +checksum = "4d3ec9d6a266cb079a44272189b5a033227d058ab28659722557c1f7fed6b83c" dependencies = [ "async-trait", + "async-tungstenite", "bytes", "flex-error", "futures", @@ -6885,9 +6984,9 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint 0.39.1", - "tendermint-config 0.39.1", - "tendermint-proto 0.39.1", + "tendermint 0.40.0", + "tendermint-config 0.40.0", + "tendermint-proto 0.40.0", "thiserror", "time", "tokio", @@ -6914,7 +7013,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7046,7 +7145,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7173,17 +7272,17 @@ dependencies = [ "axum 0.7.9", "base64 0.22.1", "bytes", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.0", + "hyper 1.5.1", "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", "prost", - "rustls-native-certs 0.8.0", + "rustls-native-certs 0.8.1", "rustls-pemfile 2.2.0", "socket2", "tokio", @@ -7280,7 +7379,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7433,9 +7532,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -7606,7 +7705,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -7640,7 +7739,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7949,7 +8048,7 @@ dependencies = [ "group", "hex-conservative 0.1.2", "hyper 0.14.31", - "ibc-proto", + "ibc-proto 0.47.1", "ibc-relayer-types", "ics23", "informalsystems-pbjson", @@ -7989,7 +8088,7 @@ dependencies = [ "spki", "subtle", "syn 1.0.109", - "syn 2.0.87", + "syn 2.0.89", "tendermint 0.38.1", "tendermint-proto 0.38.1", "tendermint-proto 0.39.1", @@ -8048,7 +8147,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -8070,7 +8169,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8090,7 +8189,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -8111,7 +8210,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8133,5 +8232,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] diff --git a/framework/contracts/native/ibc-client/Cargo.toml b/framework/contracts/native/ibc-client/Cargo.toml index 3b8367cb1..ae6d3b2bf 100644 --- a/framework/contracts/native/ibc-client/Cargo.toml +++ b/framework/contracts/native/ibc-client/Cargo.toml @@ -37,7 +37,7 @@ thiserror = { workspace = true } workspace-hack = { version = "0.1", path = "../../../workspace-hack" } [dev-dependencies] -abstract-interface = { workspace = true, features = ["interchain"] } +abstract-interface = { workspace = true, features = ["interchain", "testing"] } abstract-testing = { workspace = true } cosmwasm-schema = { workspace = true } cw-orch = { workspace = true } diff --git a/framework/contracts/native/ibc-client/src/ibc.rs b/framework/contracts/native/ibc-client/src/ibc.rs index be2559392..070f962dd 100644 --- a/framework/contracts/native/ibc-client/src/ibc.rs +++ b/framework/contracts/native/ibc-client/src/ibc.rs @@ -8,6 +8,7 @@ use abstract_std::{ IbcClientCallback, }, objects::TruncatedChainId, + ABSTRACT_EVENT_TYPE, }; use cosmwasm_std::{from_json, Attribute, DepsMut, Env, MessageInfo}; @@ -64,7 +65,7 @@ pub fn receive_action_callback( let wasm_abstract_attributes: Vec = account_creation_result .events .into_iter() - .filter(|e| e.ty == "wasm-abstract") + .filter(|e| e.ty == ABSTRACT_EVENT_TYPE) .flat_map(|e| e.attributes) .collect(); diff --git a/framework/contracts/native/ibc-client/tests/multihop_accounts.rs b/framework/contracts/native/ibc-client/tests/multihop_accounts.rs new file mode 100644 index 000000000..7b0893108 --- /dev/null +++ b/framework/contracts/native/ibc-client/tests/multihop_accounts.rs @@ -0,0 +1,94 @@ +use abstract_interface::Abstract; +use abstract_std::{ + ibc::polytone_callbacks::CallbackMessage, + ibc_client::{ExecuteMsgFns as _, IbcClientCallback}, + objects::{AccountId, TruncatedChainId}, + ABSTRACT_EVENT_TYPE, +}; +use cosmwasm_std::{to_json_binary, StdResult, SubMsgResponse}; +use cw_orch::{core::serde_json, mock::MockBech32, prelude::*, take_storage_snapshot}; + +type AResult = cw_orch::anyhow::Result<()>; // alias for Result<(), anyhow::Error> + +#[test] +fn multihop_account_snapshot() -> AResult { + let chain = MockBech32::new("mock"); + // Mock note, so it can take execute calls + let note_code_id = chain + .upload_custom( + "note", + Box::new(ContractWrapper::new( + |_, _, _, _: serde_json::Value| StdResult::Ok(cosmwasm_std::Response::new()), + |_, _, _, _: Empty| StdResult::Ok(cosmwasm_std::Response::new()), + |_, + _, + _: cosmwasm_std::Empty| + -> Result { + unreachable!() + }, + )), + )? + .uploaded_code_id()?; + let note = chain + .instantiate(note_code_id, &Empty {}, Some("note"), None, &[])? + .instantiated_contract_address()?; + + // Make ibc-client trust our mock note for registering accounts + let deployment = Abstract::new(chain.clone()); + deployment.ibc.client.upload()?; + deployment + .ibc + .client + .instantiate(&abstract_std::ibc_client::InstantiateMsg {}, None, &[])?; + deployment.ibc.client.register_infrastructure( + TruncatedChainId::from_chain_id("remote-1"), + "host", + note.clone(), + )?; + deployment + .ibc + .client + .call_as(¬e) + .callback(CallbackMessage { + initiator: deployment.ibc.client.address()?, + initiator_msg: to_json_binary(&IbcClientCallback::WhoAmI {})?, + result: abstract_std::ibc::polytone_callbacks::Callback::Execute(Ok( + abstract_std::ibc::polytone_callbacks::ExecutionResponse { + executed_by: "host".to_owned(), + result: vec![], + }, + )), + })?; + + // register account + deployment + .ibc + .client + .call_as(¬e) + .callback(CallbackMessage { + initiator: deployment.ibc.client.address()?, + initiator_msg: to_json_binary(&IbcClientCallback::CreateAccount { + account_id: AccountId::new( + 42, + abstract_std::objects::AccountTrace::Remote(vec![ + TruncatedChainId::from_chain_id("remote-1"), + TruncatedChainId::from_chain_id("remote-2"), + ]), + )?, + })?, + result: abstract_std::ibc::polytone_callbacks::Callback::Execute(Ok( + abstract_std::ibc::polytone_callbacks::ExecutionResponse { + executed_by: "host".to_owned(), + #[allow(deprecated)] + result: vec![SubMsgResponse { + events: vec![cosmwasm_std::Event::new(ABSTRACT_EVENT_TYPE) + .add_attribute("account_address", "remote_account")], + data: None, + msg_responses: vec![], + }], + }, + )), + })?; + take_storage_snapshot!(chain, "multihop_account"); + Ok(()) +} diff --git a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap new file mode 100644 index 000000000..52b7b41a0 --- /dev/null +++ b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap @@ -0,0 +1,17 @@ +--- +source: contracts/native/ibc-client/tests/multihop_accounts.rs +expression: all_storage +--- +"abstract:ibc-client": + - - "\u0000\u0002earemote" + - "{\"polytone_note\":\"mock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t\",\"remote_abstract_host\":\"host\",\"remote_proxy\":\"host\"}" + - - "\u0000\u0002ebmock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t" + - "\"remote\"" + - - "\u0000\u0002ec\u0000\u0006remote\u0000\u0001>\u0000\u0006remote\u0000\u0004\u0000\u0000\u0000*remote" + - "\"remote_account\"" + - - contract_info + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - - mod + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - - ownership + - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" From 101bf2043a61c9a9561011174239913c390b7ce6 Mon Sep 17 00:00:00 2001 From: Buckram Date: Fri, 22 Nov 2024 15:52:02 +0200 Subject: [PATCH 06/25] found state bug --- .../native/ibc-client/src/queries.rs | 1 - .../ibc-client/tests/multihop_accounts.rs | 29 +++++++++++++------ .../contracts/native/registry/src/queries.rs | 2 +- .../src/objects/account/account_id.rs | 2 +- .../src/objects/account/account_trace.rs | 3 +- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/framework/contracts/native/ibc-client/src/queries.rs b/framework/contracts/native/ibc-client/src/queries.rs index 63603015f..47c3ea700 100644 --- a/framework/contracts/native/ibc-client/src/queries.rs +++ b/framework/contracts/native/ibc-client/src/queries.rs @@ -44,7 +44,6 @@ pub fn list_accounts( Ok::<_, StdError>((AccountId::new(seq, trace).unwrap(), chain, address)) }, )?; - Ok(ListAccountsResponse { accounts }) } diff --git a/framework/contracts/native/ibc-client/tests/multihop_accounts.rs b/framework/contracts/native/ibc-client/tests/multihop_accounts.rs index 7b0893108..d25c1fe49 100644 --- a/framework/contracts/native/ibc-client/tests/multihop_accounts.rs +++ b/framework/contracts/native/ibc-client/tests/multihop_accounts.rs @@ -1,7 +1,7 @@ use abstract_interface::Abstract; use abstract_std::{ ibc::polytone_callbacks::CallbackMessage, - ibc_client::{ExecuteMsgFns as _, IbcClientCallback}, + ibc_client::{ExecuteMsgFns as _, IbcClientCallback, QueryMsgFns}, objects::{AccountId, TruncatedChainId}, ABSTRACT_EVENT_TYPE, }; @@ -41,7 +41,7 @@ fn multihop_account_snapshot() -> AResult { .client .instantiate(&abstract_std::ibc_client::InstantiateMsg {}, None, &[])?; deployment.ibc.client.register_infrastructure( - TruncatedChainId::from_chain_id("remote-1"), + TruncatedChainId::from_chain_id("remoteone-1"), "host", note.clone(), )?; @@ -60,6 +60,13 @@ fn multihop_account_snapshot() -> AResult { )), })?; + let multihop_account_id = AccountId::new( + 42, + abstract_std::objects::AccountTrace::Remote(vec![ + TruncatedChainId::from_chain_id("remoteone-1"), + TruncatedChainId::from_chain_id("remotetwo-1"), + ]), + )?; // register account deployment .ibc @@ -68,13 +75,7 @@ fn multihop_account_snapshot() -> AResult { .callback(CallbackMessage { initiator: deployment.ibc.client.address()?, initiator_msg: to_json_binary(&IbcClientCallback::CreateAccount { - account_id: AccountId::new( - 42, - abstract_std::objects::AccountTrace::Remote(vec![ - TruncatedChainId::from_chain_id("remote-1"), - TruncatedChainId::from_chain_id("remote-2"), - ]), - )?, + account_id: multihop_account_id.clone(), })?, result: abstract_std::ibc::polytone_callbacks::Callback::Execute(Ok( abstract_std::ibc::polytone_callbacks::ExecutionResponse { @@ -89,6 +90,16 @@ fn multihop_account_snapshot() -> AResult { }, )), })?; + let accounts = deployment.ibc.client.list_accounts(None, None)?; + // Make sure we have in state exactly what we did put + assert_eq!( + accounts.accounts, + vec![( + multihop_account_id, + TruncatedChainId::from_chain_id("remoteone-1"), + "remote_account".to_owned() + )] + ); take_storage_snapshot!(chain, "multihop_account"); Ok(()) } diff --git a/framework/contracts/native/registry/src/queries.rs b/framework/contracts/native/registry/src/queries.rs index f635cf4e8..cf482ba5d 100644 --- a/framework/contracts/native/registry/src/queries.rs +++ b/framework/contracts/native/registry/src/queries.rs @@ -608,7 +608,7 @@ mod test { let yank_msg = ExecuteMsg::YankModule { module: module_info, }; - let res = dbg!(execute_as(deps, &abstr.owner, yank_msg)); + let res = execute_as(deps, &abstr.owner, yank_msg); assert!(res.is_ok()); } diff --git a/framework/packages/abstract-std/src/objects/account/account_id.rs b/framework/packages/abstract-std/src/objects/account/account_id.rs index be7f2d382..9bb562b71 100644 --- a/framework/packages/abstract-std/src/objects/account/account_id.rs +++ b/framework/packages/abstract-std/src/objects/account/account_id.rs @@ -362,8 +362,8 @@ mod test { assert_eq!( account_id.trace, AccountTrace::Remote(vec![ - TruncatedChainId::_from_str("ethereum"), TruncatedChainId::_from_str("bitcoin"), + TruncatedChainId::_from_str("ethereum"), ]) ); } diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 49fa0e6cd..ac1642f17 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -179,8 +179,9 @@ fn account_trace_from_str(trace: &str) -> AccountTrace { // DoubleEndedSearcher implemented for char, but not for "str" .split(CHAIN_DELIMITER.chars().next().unwrap()) .map(TruncatedChainId::_from_str) + .rev() .collect(); - AccountTrace::Remote(rev_trace.into_iter().rev().collect()) + AccountTrace::Remote(rev_trace) } } From b692c8423e0a650ffb6d77d6e3257d07db470f5f Mon Sep 17 00:00:00 2001 From: Buckram Date: Fri, 22 Nov 2024 18:29:15 +0200 Subject: [PATCH 07/25] add failing tests --- .../ibc-client/tests/multihop_accounts.rs | 1 + .../src/objects/account/account_trace.rs | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/framework/contracts/native/ibc-client/tests/multihop_accounts.rs b/framework/contracts/native/ibc-client/tests/multihop_accounts.rs index d25c1fe49..3fd8b8d0b 100644 --- a/framework/contracts/native/ibc-client/tests/multihop_accounts.rs +++ b/framework/contracts/native/ibc-client/tests/multihop_accounts.rs @@ -100,6 +100,7 @@ fn multihop_account_snapshot() -> AResult { "remote_account".to_owned() )] ); + take_storage_snapshot!(chain, "multihop_account"); Ok(()) } diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index ac1642f17..db83084fe 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -300,23 +300,39 @@ mod test { AccountTrace::Remote(vec![TruncatedChainId::from_str("bitcoin").unwrap()]) } + fn mock_multi_hop_key() -> AccountTrace { + AccountTrace::Remote(vec![ + TruncatedChainId::from_str("bitcoin").unwrap(), + TruncatedChainId::from_str("atom").unwrap(), + TruncatedChainId::from_str("foo").unwrap(), + ]) + } + #[coverage_helper::test] fn storage_key_works() { let mut deps = mock_dependencies(); let key = mock_key(); + let multihop_key = mock_multi_hop_key(); let map: Map<&AccountTrace, u64> = Map::new("map"); map.save(deps.as_mut().storage, &key, &42069).unwrap(); + map.save(deps.as_mut().storage, &multihop_key, &69420) + .unwrap(); assert_eq!(map.load(deps.as_ref().storage, &key).unwrap(), 42069); + assert_eq!( + map.load(deps.as_ref().storage, &multihop_key).unwrap(), + 69420 + ); let items = map .range(deps.as_ref().storage, None, None, Order::Ascending) .map(|item| item.unwrap()) .collect::>(); - assert_eq!(items.len(), 1); - assert_eq!(items[0], (key, 42069)); + assert_eq!(items.len(), 2); + assert_eq!(items[0], (multihop_key, 69420)); + assert_eq!(items[1], (key, 42069)); } #[coverage_helper::test] From 562f4f5639d173ee3ed3ead49e7d5358cc66d2cd Mon Sep 17 00:00:00 2001 From: Buckram Date: Fri, 22 Nov 2024 18:50:20 +0200 Subject: [PATCH 08/25] fix AccountTrace key, but not the composite --- .../abstract-std/src/objects/account/account_trace.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index db83084fe..53becf9a8 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -22,6 +22,7 @@ impl KeyDeserialize for &AccountTrace { #[inline(always)] fn from_vec(value: Vec) -> StdResult { + let value = value.into_iter().filter(|b| *b > 32).collect(); Ok(AccountTrace::from_string(String::from_vec(value)?)) } } @@ -39,6 +40,7 @@ impl<'a> PrimaryKey<'a> for AccountTrace { let len = chain_name.len(); chain_name .iter() + .rev() .enumerate() .flat_map(|(s, c)| { if s == len - 1 { @@ -339,6 +341,7 @@ mod test { fn composite_key_works() { let mut deps = mock_dependencies(); let key = mock_key(); + let multihop_key = mock_multi_hop_key(); let map: Map<(&AccountTrace, Addr), u64> = Map::new("map"); map.save( @@ -347,6 +350,12 @@ mod test { &42069, ) .unwrap(); + map.save( + deps.as_mut().storage, + (&multihop_key, Addr::unchecked("larry")), + &42069, + ) + .unwrap(); map.save( deps.as_mut().storage, @@ -361,7 +370,7 @@ mod test { .map(|item| item.unwrap()) .collect::>(); - assert_eq!(items.len(), 2); + assert_eq!(items.len(), 3); assert_eq!(items[0], (Addr::unchecked("jake"), 69420)); assert_eq!(items[1], (Addr::unchecked("larry"), 42069)); } From 3bbd5052f2b8b5484a254c84bf9f0ef3a8acb4e1 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Mon, 25 Nov 2024 07:54:39 +0000 Subject: [PATCH 09/25] Fix multi-hop test --- .../packages/abstract-std/src/objects/account/account_id.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_id.rs b/framework/packages/abstract-std/src/objects/account/account_id.rs index 9bb562b71..7946a3f36 100644 --- a/framework/packages/abstract-std/src/objects/account/account_id.rs +++ b/framework/packages/abstract-std/src/objects/account/account_id.rs @@ -375,9 +375,9 @@ mod test { assert_eq!( account_id.trace, AccountTrace::Remote(vec![ - TruncatedChainId::_from_str("ethereum"), - TruncatedChainId::_from_str("bitcoin"), TruncatedChainId::_from_str("cosmos"), + TruncatedChainId::_from_str("bitcoin"), + TruncatedChainId::_from_str("ethereum"), ]) ); } From 191f9c8ddb67479b5967392d0a8d668ef5c2fc18 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 26 Nov 2024 14:31:09 +0000 Subject: [PATCH 10/25] Better account id storage serialization --- .../src/objects/account/account_id.rs | 105 +++++++++++++----- .../src/objects/account/account_trace.rs | 59 +++++----- .../src/objects/entry/asset_entry.rs | 2 +- .../src/objects/entry/channel_entry.rs | 2 +- .../src/objects/entry/contract_entry.rs | 2 +- .../src/objects/entry/dex_asset_pairing.rs | 2 +- .../abstract-std/src/objects/module.rs | 2 +- 7 files changed, 117 insertions(+), 57 deletions(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_id.rs b/framework/packages/abstract-std/src/objects/account/account_id.rs index 7946a3f36..0611ff5f6 100644 --- a/framework/packages/abstract-std/src/objects/account/account_id.rs +++ b/framework/packages/abstract-std/src/objects/account/account_id.rs @@ -1,7 +1,8 @@ use std::{fmt::Display, str::FromStr}; -use cosmwasm_std::{StdError, StdResult}; +use cosmwasm_std::StdResult; use cw_storage_plus::{Key, KeyDeserialize, Prefixer, PrimaryKey}; +use deser::split_first_key; use super::{account_trace::AccountTrace, AccountSequence}; use crate::{objects::TruncatedChainId, AbstractError}; @@ -160,48 +161,72 @@ impl<'a> Prefixer<'a> for AccountId { impl KeyDeserialize for &AccountId { type Output = AccountId; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = AccountId::KEY_ELEMS; #[inline(always)] - fn from_vec(mut value: Vec) -> StdResult { - let mut tu = value.split_off(2); - let t_len = parse_length(&value)?; - let u = tu.split_off(t_len); + fn from_vec(value: Vec) -> StdResult { + let (trace, seq) = split_first_key(AccountTrace::KEY_ELEMS, value.as_ref())?; + + println!("{:x?} - {:?}", trace, seq); Ok(AccountId { - seq: AccountSequence::from_vec(u)?, - trace: AccountTrace::from_string(String::from_vec(tu)?), + seq: AccountSequence::from_vec(seq.to_vec())?, + trace: AccountTrace::from_vec(trace)?, }) } } impl KeyDeserialize for AccountId { type Output = AccountId; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = AccountTrace::KEY_ELEMS + u32::KEY_ELEMS; #[inline(always)] - fn from_vec(mut value: Vec) -> StdResult { - let mut tu = value.split_off(2); - let t_len = parse_length(&value)?; - let u = tu.split_off(t_len); - - Ok(AccountId { - seq: AccountSequence::from_vec(u)?, - trace: AccountTrace::from_string(String::from_vec(tu)?), - }) + fn from_vec(value: Vec) -> StdResult { + <&AccountId>::from_vec(value) } } -#[inline(always)] -fn parse_length(value: &[u8]) -> StdResult { - Ok(u16::from_be_bytes( - value - .try_into() - .map_err(|_| StdError::generic_err("Could not read 2 byte length"))?, - ) - .into()) -} +/// This was copied from cosmwasm-std +/// +/// https://github.com/CosmWasm/cw-storage-plus/blob/f65cd4000a0dc1c009f3f99e23f9e10a1c256a68/src/de.rs#L173 +pub(crate) mod deser { + use cosmwasm_std::{StdError, StdResult}; + + /// Splits the first key from the value based on the provided number of key elements. + /// The return value is ordered as (first_key, remainder). + /// + pub fn split_first_key(key_elems: u16, value: &[u8]) -> StdResult<(Vec, &[u8])> { + let mut index = 0; + let mut first_key = Vec::new(); + + // Iterate over the sub keys + for i in 0..key_elems { + let len_slice = &value[index..index + 2]; + index += 2; + let is_last_key = i == key_elems - 1; + + if !is_last_key { + first_key.extend_from_slice(len_slice); + } + + let subkey_len = parse_length(len_slice)?; + first_key.extend_from_slice(&value[index..index + subkey_len]); + index += subkey_len; + } + let remainder = &value[index..]; + Ok((first_key, remainder)) + } + + fn parse_length(value: &[u8]) -> StdResult { + Ok(u16::from_be_bytes( + value + .try_into() + .map_err(|_| StdError::generic_err("Could not read 2 byte length"))?, + ) + .into()) + } +} //-------------------------------------------------------------------------------------------------- // Tests //-------------------------------------------------------------------------------------------------- @@ -226,6 +251,13 @@ mod test { } } + fn mock_local_key() -> AccountId { + AccountId { + seq: 54, + trace: AccountTrace::Remote(vec![]), + } + } + fn mock_keys() -> (AccountId, AccountId, AccountId) { ( AccountId { @@ -268,6 +300,25 @@ mod test { assert_eq!(items[0], (key, 42069)); } + #[coverage_helper::test] + fn storage_key_local_works() { + let mut deps = mock_dependencies(); + let key = mock_local_key(); + let map: Map<&AccountId, u64> = Map::new("map"); + + map.save(deps.as_mut().storage, &key, &42069).unwrap(); + + assert_eq!(map.load(deps.as_ref().storage, &key).unwrap(), 42069); + + let items = map + .range(deps.as_ref().storage, None, None, Order::Ascending) + .map(|item| item.unwrap()) + .collect::>(); + + assert_eq!(items.len(), 1); + assert_eq!(items[0], (key, 42069)); + } + #[coverage_helper::test] fn composite_key_works() { let mut deps = mock_dependencies(); diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 53becf9a8..f4574b3a6 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -1,11 +1,12 @@ use std::fmt::Display; +use super::account_id::deser::split_first_key; use cosmwasm_std::{ensure, Env, StdError, StdResult}; use cw_storage_plus::{Key, KeyDeserialize, Prefixer, PrimaryKey}; use crate::{constants::CHAIN_DELIMITER, objects::TruncatedChainId, AbstractError}; -pub const MAX_TRACE_LENGTH: usize = 6; +pub const MAX_TRACE_LENGTH: u16 = 6; pub(crate) const LOCAL: &str = "local"; /// The identifier of chain that triggered the account creation @@ -16,14 +17,30 @@ pub enum AccountTrace { Remote(Vec), } +pub const ACCOUNT_TRACE_KEY_PLACEHOLDER: &str = "place-holder-key"; + impl KeyDeserialize for &AccountTrace { type Output = AccountTrace; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = AccountTrace::KEY_ELEMS; #[inline(always)] fn from_vec(value: Vec) -> StdResult { - let value = value.into_iter().filter(|b| *b > 32).collect(); - Ok(AccountTrace::from_string(String::from_vec(value)?)) + let mut trace = vec![]; + // We parse the whole data for the MAX_TRACE_LENGTH keys + let mut value = value.as_ref(); + for i in 0..MAX_TRACE_LENGTH - 1 { + let (t, remainder) = split_first_key(1, value)?; + value = remainder; + let chain = String::from_utf8(t)?; + if i == 0 && chain == "local" { + return Ok(AccountTrace::Local); + } + if chain != ACCOUNT_TRACE_KEY_PLACEHOLDER { + trace.push(TruncatedChainId::from_string(chain).unwrap()) + } + } + + Ok(AccountTrace::Remote(trace)) } } @@ -34,35 +51,27 @@ impl<'a> PrimaryKey<'a> for AccountTrace { type SuperSuffix = Self; fn key(&self) -> Vec { - match self { + let mut serialization_result = match self { AccountTrace::Local => LOCAL.key(), - AccountTrace::Remote(chain_name) => { - let len = chain_name.len(); - chain_name - .iter() - .rev() - .enumerate() - .flat_map(|(s, c)| { - if s == len - 1 { - vec![c.str_ref().key()] - } else { - vec![c.str_ref().key(), CHAIN_DELIMITER.key()] - } - }) - .flatten() - .collect::>() - } + AccountTrace::Remote(chain_name) => chain_name + .iter() + .flat_map(|c| c.str_ref().key()) + .collect::>(), + }; + for _ in serialization_result.len()..(MAX_TRACE_LENGTH as usize) { + serialization_result.extend(ACCOUNT_TRACE_KEY_PLACEHOLDER.key()); } + serialization_result } } impl KeyDeserialize for AccountTrace { type Output = AccountTrace; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = MAX_TRACE_LENGTH; #[inline(always)] fn from_vec(value: Vec) -> StdResult { - Ok(AccountTrace::from_string(String::from_vec(value)?)) + <&AccountTrace>::from_vec(value) } } @@ -80,7 +89,7 @@ impl AccountTrace { AccountTrace::Remote(chain_trace) => { // Ensure the trace length is limited ensure!( - chain_trace.len() <= MAX_TRACE_LENGTH, + chain_trace.len() <= MAX_TRACE_LENGTH as usize, AbstractError::FormattingError { object: "chain-seq".into(), expected: format!("between 1 and {MAX_TRACE_LENGTH}"), @@ -370,7 +379,7 @@ mod test { .map(|item| item.unwrap()) .collect::>(); - assert_eq!(items.len(), 3); + assert_eq!(items.len(), 2); assert_eq!(items[0], (Addr::unchecked("jake"), 69420)); assert_eq!(items[1], (Addr::unchecked("larry"), 42069)); } diff --git a/framework/packages/abstract-std/src/objects/entry/asset_entry.rs b/framework/packages/abstract-std/src/objects/entry/asset_entry.rs index 513daee0d..ce538a43a 100644 --- a/framework/packages/abstract-std/src/objects/entry/asset_entry.rs +++ b/framework/packages/abstract-std/src/objects/entry/asset_entry.rs @@ -111,7 +111,7 @@ impl KeyDeserialize for AssetEntry { impl KeyDeserialize for &AssetEntry { type Output = AssetEntry; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = AssetEntry::KEY_ELEMS; #[inline(always)] fn from_vec(value: Vec) -> StdResult { diff --git a/framework/packages/abstract-std/src/objects/entry/channel_entry.rs b/framework/packages/abstract-std/src/objects/entry/channel_entry.rs index a75272b51..4a03fc1ff 100644 --- a/framework/packages/abstract-std/src/objects/entry/channel_entry.rs +++ b/framework/packages/abstract-std/src/objects/entry/channel_entry.rs @@ -83,7 +83,7 @@ impl<'a> Prefixer<'a> for &ChannelEntry { impl KeyDeserialize for &ChannelEntry { type Output = ChannelEntry; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = 2; #[inline(always)] fn from_vec(mut value: Vec) -> StdResult { diff --git a/framework/packages/abstract-std/src/objects/entry/contract_entry.rs b/framework/packages/abstract-std/src/objects/entry/contract_entry.rs index efd1723f6..c7ea692b8 100644 --- a/framework/packages/abstract-std/src/objects/entry/contract_entry.rs +++ b/framework/packages/abstract-std/src/objects/entry/contract_entry.rs @@ -107,7 +107,7 @@ impl<'a> Prefixer<'a> for &ContractEntry { impl KeyDeserialize for &ContractEntry { type Output = ContractEntry; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = 2; #[inline(always)] fn from_vec(mut value: Vec) -> StdResult { diff --git a/framework/packages/abstract-std/src/objects/entry/dex_asset_pairing.rs b/framework/packages/abstract-std/src/objects/entry/dex_asset_pairing.rs index 4f370bb1a..a3280572f 100644 --- a/framework/packages/abstract-std/src/objects/entry/dex_asset_pairing.rs +++ b/framework/packages/abstract-std/src/objects/entry/dex_asset_pairing.rs @@ -66,7 +66,7 @@ impl<'a> Prefixer<'a> for &DexAssetPairing { impl KeyDeserialize for &DexAssetPairing { type Output = DexAssetPairing; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = 3; #[inline(always)] fn from_vec(value: Vec) -> StdResult { diff --git a/framework/packages/abstract-std/src/objects/module.rs b/framework/packages/abstract-std/src/objects/module.rs index c5f22b813..1dea3f02d 100644 --- a/framework/packages/abstract-std/src/objects/module.rs +++ b/framework/packages/abstract-std/src/objects/module.rs @@ -175,7 +175,7 @@ impl<'a> Prefixer<'a> for &ModuleInfo { impl KeyDeserialize for &ModuleInfo { type Output = ModuleInfo; - const KEY_ELEMS: u16 = 1; + const KEY_ELEMS: u16 = Namespace::KEY_ELEMS + String::KEY_ELEMS + ModuleVersion::KEY_ELEMS; #[inline(always)] fn from_vec(mut value: Vec) -> StdResult { From 798070e2802ba90b6960c3781239150ee8ceff2f Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 26 Nov 2024 14:35:32 +0000 Subject: [PATCH 11/25] Modify key deserialize impl --- .../src/objects/account/account_trace.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index f4574b3a6..195f38f89 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -17,7 +17,7 @@ pub enum AccountTrace { Remote(Vec), } -pub const ACCOUNT_TRACE_KEY_PLACEHOLDER: &str = "place-holder-key"; +pub const ACCOUNT_TRACE_KEY_PLACEHOLDER: &[u8] = b"a"; impl KeyDeserialize for &AccountTrace { type Output = AccountTrace; @@ -29,15 +29,16 @@ impl KeyDeserialize for &AccountTrace { // We parse the whole data for the MAX_TRACE_LENGTH keys let mut value = value.as_ref(); for i in 0..MAX_TRACE_LENGTH - 1 { - let (t, remainder) = split_first_key(1, value)?; + let (current_chain, remainder) = split_first_key(1, value)?; value = remainder; - let chain = String::from_utf8(t)?; + if current_chain == ACCOUNT_TRACE_KEY_PLACEHOLDER { + continue; + } + let chain = String::from_utf8(current_chain)?; if i == 0 && chain == "local" { return Ok(AccountTrace::Local); } - if chain != ACCOUNT_TRACE_KEY_PLACEHOLDER { - trace.push(TruncatedChainId::from_string(chain).unwrap()) - } + trace.push(TruncatedChainId::from_string(chain).unwrap()) } Ok(AccountTrace::Remote(trace)) From 4e30a6aa00f9f009f1cde1ec9dd38ad828379682 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 26 Nov 2024 14:35:44 +0000 Subject: [PATCH 12/25] formatting [skip ci] --- .../packages/abstract-std/src/objects/account/account_id.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_id.rs b/framework/packages/abstract-std/src/objects/account/account_id.rs index 0611ff5f6..9faf3d083 100644 --- a/framework/packages/abstract-std/src/objects/account/account_id.rs +++ b/framework/packages/abstract-std/src/objects/account/account_id.rs @@ -187,7 +187,7 @@ impl KeyDeserialize for AccountId { } /// This was copied from cosmwasm-std -/// +/// /// https://github.com/CosmWasm/cw-storage-plus/blob/f65cd4000a0dc1c009f3f99e23f9e10a1c256a68/src/de.rs#L173 pub(crate) mod deser { use cosmwasm_std::{StdError, StdResult}; From 198d47630a9dce0a730d266dab908c1c554d9e58 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 26 Nov 2024 14:46:56 +0000 Subject: [PATCH 13/25] =?UTF-8?q?Insta=20tests=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snapshots/adapters__account_install_adapter.snap | 8 ++++---- .../snapshots/adapters__install_one_adapter.snap | 8 ++++---- .../adapters__install_one_adapter_with_fee.snap | 8 ++++---- ...ing_specific_version_should_install_expected.snap | 8 ++++---- ...ters__reinstalling_adapter_should_be_allowed.snap | 8 ++++---- ...installing_new_version_should_install_latest.snap | 8 ++++---- .../tests/snapshots/apps__account_install_app.snap | 8 ++++---- .../tests/snapshots/apps__execute_on_account.snap | 6 +++--- ...tall_modules__adds_module_to_account_modules.snap | 8 ++++---- .../proxy__account_install_multiple_modules.snap | 4 ++-- .../proxy__account_install_standalone_modules.snap | 4 ++-- .../snapshots/proxy__account_with_response_data.snap | 8 ++++---- .../proxy__default_without_response_data.snap | 8 ++++---- .../tests/snapshots/proxy__exec_on_account.snap | 6 +++--- .../tests/snapshots/proxy__instantiate_account.snap | 6 +++--- ...ccount_updating_on_subaccount_should_succeed.snap | 8 ++++---- ...count__creating_on_subaccount_should_succeed.snap | 8 ++++---- ...ed_app_updating_on_subaccount_should_succeed.snap | 8 ++++---- ...ursive_updating_on_subaccount_should_succeed.snap | 10 +++++----- .../subaccount__sub_account_move_ownership.snap | 8 ++++---- ...t__sub_account_move_ownership_to_sub_account.snap | 12 ++++++------ ...count__updating_on_subaccount_should_succeed.snap | 8 ++++---- .../multihop_accounts__multihop_account.snap | 6 +++--- .../src/objects/account/account_trace.rs | 9 +++++++++ 24 files changed, 96 insertions(+), 87 deletions(-) diff --git a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap index 5c771993a..9f5a97e24 100644 --- a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap index ebc46d191..090d5bb88 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap index 87f50a9f1..76c01900d 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002cf\u0000\u0006tester\u0000\u000etest-module-id0.25.0" - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"ujunox\",\"amount\":\"45\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap index ec5202f33..80f4c35a4 100644 --- a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap +++ b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap index ebc46d191..090d5bb88 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap index 3e2a04570..5f74ec5f3 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap index f38a7b471..f182ae6e5 100644 --- a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap +++ b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap index 27be40a3e..ab40f76b9 100644 --- a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap +++ b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap index e2506087b..e156fc43d 100644 --- a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap +++ b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap @@ -87,17 +87,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap index 1dfaf4a1a..043dd73a0 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap @@ -76,11 +76,11 @@ expression: all_storage - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"token1\",\"amount\":\"42\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - "\u0000\u0002cf\u0000\babstract\u0000\u000bstandalone21.0.0" - "{\"monetization\":\"none\",\"metadata\":null,\"instantiation_funds\":[{\"denom\":\"token1\",\"amount\":\"42\"},{\"denom\":\"token2\",\"amount\":\"500\"}]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap index 70c78a7f3..c2b7d1e27 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap @@ -72,11 +72,11 @@ expression: all_storage - "{\"namespace\":\"abstract\",\"name\":\"standalone1\",\"version\":{\"version\":\"1.0.0\"}}" - - "\u0000\u0002cc\u0000\u0000\u0000\u0000\u0000\u0000\u0000\f" - "{\"namespace\":\"abstract\",\"name\":\"standalone2\",\"version\":{\"version\":\"1.0.0\"}}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap index 52a8e8c9e..2dd35fc01 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap index e58b50b68..fffcf6492 100644 --- a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap index 1479cca2c..b079f6a59 100644 --- a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap index 1479cca2c..b079f6a59 100644 --- a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap index 6249ffc86..1a7f6ef73 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap index 65bc1c216..93efdfb04 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap index 14453616b..8b439d10b 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap index 3e5c23575..d56dd81f0 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap @@ -105,17 +105,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0003" - "\"mock1a5yd8d2ehutd0p65czuq2c44f8ur8026d39j7kkktxgtqu6fj9hsc9xes4\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap index 7ffb27e53..906d97d07 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap @@ -86,15 +86,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap index d9043edd9..c9c9ad3ef 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap @@ -120,19 +120,19 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0003" - "\"mock1jxw6zgzc92jrqtxfcfc8dme05wfamr99tg2rfc6qdnpr79xmshyqy55jp5\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0004" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0004" - "\"mock1vjlnyht39vfrdkeqfw5dp7jsr7ndvf2cd6pfafn88cc5ad7phdnsg86f0s\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap index c4e55e094..44cb71912 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap index 52b7b41a0..ac5a705e4 100644 --- a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap +++ b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap @@ -3,11 +3,11 @@ source: contracts/native/ibc-client/tests/multihop_accounts.rs expression: all_storage --- "abstract:ibc-client": - - - "\u0000\u0002earemote" + - - "\u0000\u0002earemoteone" - "{\"polytone_note\":\"mock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t\",\"remote_abstract_host\":\"host\",\"remote_proxy\":\"host\"}" - - "\u0000\u0002ebmock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t" - - "\"remote\"" - - - "\u0000\u0002ec\u0000\u0006remote\u0000\u0001>\u0000\u0006remote\u0000\u0004\u0000\u0000\u0000*remote" + - "\"remoteone\"" + - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0004\u0000\u0000\u0000*remoteone" - "\"remote_account\"" - - contract_info - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 195f38f89..48eb013f9 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -312,6 +312,10 @@ mod test { AccountTrace::Remote(vec![TruncatedChainId::from_str("bitcoin").unwrap()]) } + fn mock_local_key() -> AccountTrace { + AccountTrace::Remote(vec![]) + } + fn mock_multi_hop_key() -> AccountTrace { AccountTrace::Remote(vec![ TruncatedChainId::from_str("bitcoin").unwrap(), @@ -323,14 +327,18 @@ mod test { #[coverage_helper::test] fn storage_key_works() { let mut deps = mock_dependencies(); + let local_key = mock_local_key(); let key = mock_key(); let multihop_key = mock_multi_hop_key(); let map: Map<&AccountTrace, u64> = Map::new("map"); + map.save(deps.as_mut().storage, &local_key, &159784) + .unwrap(); map.save(deps.as_mut().storage, &key, &42069).unwrap(); map.save(deps.as_mut().storage, &multihop_key, &69420) .unwrap(); + assert_eq!(map.load(deps.as_ref().storage, &local_key).unwrap(), 159784); assert_eq!(map.load(deps.as_ref().storage, &key).unwrap(), 42069); assert_eq!( map.load(deps.as_ref().storage, &multihop_key).unwrap(), @@ -345,6 +353,7 @@ mod test { assert_eq!(items.len(), 2); assert_eq!(items[0], (multihop_key, 69420)); assert_eq!(items[1], (key, 42069)); + assert_eq!(items[2], (local_key, 159784)); } #[coverage_helper::test] From d054df6a494da8ab3d47cc8b336912c520ba8389 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 26 Nov 2024 14:54:33 +0000 Subject: [PATCH 14/25] Fixing tests --- .../abstract-std/src/objects/account/account_trace.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 48eb013f9..bd4ef8526 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -350,10 +350,10 @@ mod test { .map(|item| item.unwrap()) .collect::>(); - assert_eq!(items.len(), 2); - assert_eq!(items[0], (multihop_key, 69420)); + assert_eq!(items.len(), 3); + assert_eq!(items[0], (local_key, 159784)); assert_eq!(items[1], (key, 42069)); - assert_eq!(items[2], (local_key, 159784)); + assert_eq!(items[2], (multihop_key, 69420)); } #[coverage_helper::test] From 1bbb9744e241db6524a06bf30344f71451c39a19 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Wed, 27 Nov 2024 08:28:10 +0000 Subject: [PATCH 15/25] Hakari --- framework/Cargo.lock | 37 +---------------------------- framework/workspace-hack/Cargo.toml | 12 ++++------ 2 files changed, 5 insertions(+), 44 deletions(-) diff --git a/framework/Cargo.lock b/framework/Cargo.lock index 5f46295c7..e2eb2d44c 100644 --- a/framework/Cargo.lock +++ b/framework/Cargo.lock @@ -4013,12 +4013,9 @@ dependencies = [ "bytes", "flex-error", "ics23", - "informalsystems-pbjson", "prost", - "serde", "subtle-encoding", "tendermint-proto 0.38.1", - "tonic", ] [[package]] @@ -6703,37 +6700,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "tendermint" -version = "0.38.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" -dependencies = [ - "bytes", - "digest 0.10.7", - "ed25519", - "ed25519-consensus", - "flex-error", - "futures", - "k256", - "num-traits", - "once_cell", - "prost", - "prost-types", - "ripemd", - "serde", - "serde_bytes", - "serde_json", - "serde_repr", - "sha2 0.10.8", - "signature", - "subtle", - "subtle-encoding", - "tendermint-proto 0.38.1", - "time", - "zeroize", -] - [[package]] name = "tendermint" version = "0.39.1" @@ -8048,7 +8014,6 @@ dependencies = [ "group", "hex-conservative 0.1.2", "hyper 0.14.31", - "ibc-proto 0.47.1", "ibc-relayer-types", "ics23", "informalsystems-pbjson", @@ -8089,7 +8054,7 @@ dependencies = [ "subtle", "syn 1.0.109", "syn 2.0.89", - "tendermint 0.38.1", + "tendermint 0.40.0", "tendermint-proto 0.38.1", "tendermint-proto 0.39.1", "time", diff --git a/framework/workspace-hack/Cargo.toml b/framework/workspace-hack/Cargo.toml index fb4c97f27..faf4e355b 100644 --- a/framework/workspace-hack/Cargo.toml +++ b/framework/workspace-hack/Cargo.toml @@ -110,7 +110,6 @@ getrandom = { version = "0.2", default-features = false, features = ["js"] } group = { version = "0.13", default-features = false, features = ["alloc"] } hex-conservative = { version = "0.1", default-features = false, features = ["std"] } hyper = { version = "0.14", features = ["client", "http1", "http2", "runtime", "server", "stream"] } -ibc-proto = { version = "0.47", features = ["serde"] } ibc-relayer-types = { version = "0.29", default-features = false, features = ["clock"] } ics23 = { version = "0.12" } informalsystems-pbjson = { version = "0.7" } @@ -137,7 +136,7 @@ serde_json = { version = "1", features = ["alloc", "raw_value"] } signature = { version = "2", default-features = false, features = ["digest", "rand_core", "std"] } smallvec = { version = "1", default-features = false, features = ["const_new"] } spki = { version = "0.7", default-features = false, features = ["pem", "std"] } -tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint = { version = "0.40", features = ["secp256k1"] } time = { version = "0.3", features = ["macros", "parsing"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } @@ -188,7 +187,6 @@ getrandom = { version = "0.2", default-features = false, features = ["js"] } group = { version = "0.13", default-features = false, features = ["alloc"] } hex-conservative = { version = "0.1", default-features = false, features = ["std"] } hyper = { version = "0.14", features = ["client", "http1", "http2", "runtime", "server", "stream"] } -ibc-proto = { version = "0.47", features = ["serde"] } ibc-relayer-types = { version = "0.29", default-features = false, features = ["clock"] } ics23 = { version = "0.12" } informalsystems-pbjson = { version = "0.7" } @@ -216,7 +214,7 @@ signature = { version = "2", default-features = false, features = ["digest", "ra smallvec = { version = "1", default-features = false, features = ["const_new"] } spki = { version = "0.7", default-features = false, features = ["pem", "std"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", default-features = false, features = ["fold", "visit"] } -tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint = { version = "0.40", features = ["secp256k1"] } time = { version = "0.3", features = ["macros", "parsing"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } @@ -265,7 +263,6 @@ getrandom = { version = "0.2", default-features = false, features = ["js"] } group = { version = "0.13", default-features = false, features = ["alloc"] } hex-conservative = { version = "0.1", default-features = false, features = ["std"] } hyper = { version = "0.14", features = ["client", "http1", "http2", "runtime", "server", "stream"] } -ibc-proto = { version = "0.47", features = ["serde"] } ibc-relayer-types = { version = "0.29", default-features = false, features = ["clock"] } ics23 = { version = "0.12" } informalsystems-pbjson = { version = "0.7" } @@ -292,7 +289,7 @@ serde_json = { version = "1", features = ["alloc", "raw_value"] } signature = { version = "2", default-features = false, features = ["digest", "rand_core", "std"] } smallvec = { version = "1", default-features = false, features = ["const_new"] } spki = { version = "0.7", default-features = false, features = ["pem", "std"] } -tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint = { version = "0.40", features = ["secp256k1"] } time = { version = "0.3", features = ["macros", "parsing"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } @@ -342,7 +339,6 @@ getrandom = { version = "0.2", default-features = false, features = ["js"] } group = { version = "0.13", default-features = false, features = ["alloc"] } hex-conservative = { version = "0.1", default-features = false, features = ["std"] } hyper = { version = "0.14", features = ["client", "http1", "http2", "runtime", "server", "stream"] } -ibc-proto = { version = "0.47", features = ["serde"] } ibc-relayer-types = { version = "0.29", default-features = false, features = ["clock"] } ics23 = { version = "0.12" } informalsystems-pbjson = { version = "0.7" } @@ -370,7 +366,7 @@ signature = { version = "2", default-features = false, features = ["digest", "ra smallvec = { version = "1", default-features = false, features = ["const_new"] } spki = { version = "0.7", default-features = false, features = ["pem", "std"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", default-features = false, features = ["fold", "visit"] } -tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint = { version = "0.40", features = ["secp256k1"] } time = { version = "0.3", features = ["macros", "parsing"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } From 4c869d288e5518218f3f35d820f57e483cee1026 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Wed, 27 Nov 2024 08:53:24 +0000 Subject: [PATCH 16/25] Added account multi-hop test --- .../native/ibc-client/src/contract.rs | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/framework/contracts/native/ibc-client/src/contract.rs b/framework/contracts/native/ibc-client/src/contract.rs index 844937f5f..43939d592 100644 --- a/framework/contracts/native/ibc-client/src/contract.rs +++ b/framework/contracts/native/ibc-client/src/contract.rs @@ -220,6 +220,42 @@ mod tests { Ok(()) } + mod multi_hop_accounts { + use super::*; + use abstract_std::objects::{AccountId, AccountTrace, TruncatedChainId}; + use std::str::FromStr; + + #[coverage_helper::test] + fn accounts_storage_allows_multi_hop() -> IbcClientResult<()> { + let mut deps = mock_dependencies(); + let account_id = AccountId::const_new( + 45, + AccountTrace::Remote(vec![ + TruncatedChainId::from_str("bitcoin")?, + TruncatedChainId::from_str("ethereum")?, + TruncatedChainId::from_str("cosmos")?, + ]), + ); + let remote_addr = "remote_addrress_stored".to_string(); + let chain_name = TruncatedChainId::from_str("xion")?; + + ACCOUNTS.save( + deps.as_mut().storage, + (account_id.trace(), account_id.seq(), &chain_name), + &remote_addr, + )?; + + let saved_addr = ACCOUNTS.load( + deps.as_mut().storage, + (account_id.trace(), account_id.seq(), &chain_name), + )?; + + assert_eq!(remote_addr, saved_addr); + + Ok(()) + } + } + mod migrate { use super::*; From 6570ceeb4bee787229a3810bf2e7601d02b9268d Mon Sep 17 00:00:00 2001 From: Kayanski Date: Wed, 27 Nov 2024 09:25:22 +0000 Subject: [PATCH 17/25] Added tests, reduce length --- .../adapters__account_install_adapter.snap | 8 +++---- .../adapters__install_one_adapter.snap | 8 +++---- ...dapters__install_one_adapter_with_fee.snap | 8 +++---- ...cific_version_should_install_expected.snap | 8 +++---- ...einstalling_adapter_should_be_allowed.snap | 8 +++---- ...ing_new_version_should_install_latest.snap | 8 +++---- .../snapshots/apps__account_install_app.snap | 8 +++---- .../snapshots/apps__execute_on_account.snap | 6 ++--- ...dules__adds_module_to_account_modules.snap | 8 +++---- ...oxy__account_install_multiple_modules.snap | 4 ++-- ...y__account_install_standalone_modules.snap | 4 ++-- .../proxy__account_with_response_data.snap | 8 +++---- .../proxy__default_without_response_data.snap | 8 +++---- .../snapshots/proxy__exec_on_account.snap | 6 ++--- .../snapshots/proxy__instantiate_account.snap | 6 ++--- ...updating_on_subaccount_should_succeed.snap | 8 +++---- ...creating_on_subaccount_should_succeed.snap | 8 +++---- ...updating_on_subaccount_should_succeed.snap | 8 +++---- ...updating_on_subaccount_should_succeed.snap | 10 ++++----- ...ubaccount__sub_account_move_ownership.snap | 8 +++---- ...account_move_ownership_to_sub_account.snap | 12 +++++----- ...updating_on_subaccount_should_succeed.snap | 8 +++---- .../native/ibc-client/src/contract.rs | 17 +++++++++----- .../multihop_accounts__multihop_account.snap | 2 +- .../src/objects/account/account_id.rs | 2 -- .../src/objects/account/account_trace.rs | 22 +++++++++---------- 26 files changed, 108 insertions(+), 103 deletions(-) diff --git a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap index 9f5a97e24..345596cf2 100644 --- a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap index 090d5bb88..d55909063 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap index 76c01900d..9f60b6896 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002cf\u0000\u0006tester\u0000\u000etest-module-id0.25.0" - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"ujunox\",\"amount\":\"45\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap index 80f4c35a4..d9435a567 100644 --- a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap +++ b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap index 090d5bb88..d55909063 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap index 5f74ec5f3..b180c20d8 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap index f182ae6e5..528bf7890 100644 --- a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap +++ b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap index ab40f76b9..ad39cf961 100644 --- a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap +++ b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap index e156fc43d..e3710c7ae 100644 --- a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap +++ b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap @@ -87,17 +87,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap index 043dd73a0..431c3ea35 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap @@ -76,11 +76,11 @@ expression: all_storage - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"token1\",\"amount\":\"42\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - "\u0000\u0002cf\u0000\babstract\u0000\u000bstandalone21.0.0" - "{\"monetization\":\"none\",\"metadata\":null,\"instantiation_funds\":[{\"denom\":\"token1\",\"amount\":\"42\"},{\"denom\":\"token2\",\"amount\":\"500\"}]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap index c2b7d1e27..69683d56d 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap @@ -72,11 +72,11 @@ expression: all_storage - "{\"namespace\":\"abstract\",\"name\":\"standalone1\",\"version\":{\"version\":\"1.0.0\"}}" - - "\u0000\u0002cc\u0000\u0000\u0000\u0000\u0000\u0000\u0000\f" - "{\"namespace\":\"abstract\",\"name\":\"standalone2\",\"version\":{\"version\":\"1.0.0\"}}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap index 2dd35fc01..b585e1a10 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap index fffcf6492..7508cfe4f 100644 --- a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap index b079f6a59..568de7944 100644 --- a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap index b079f6a59..568de7944 100644 --- a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap index 1a7f6ef73..570f65342 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap index 93efdfb04..c908c4245 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap index 8b439d10b..b3dc93ccb 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap index d56dd81f0..d1e9734f1 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap @@ -105,17 +105,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" - "\"mock1a5yd8d2ehutd0p65czuq2c44f8ur8026d39j7kkktxgtqu6fj9hsc9xes4\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap index 906d97d07..c5145d269 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap @@ -86,15 +86,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap index c9c9ad3ef..ae83bd02d 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap @@ -120,19 +120,19 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" - "\"mock1jxw6zgzc92jrqtxfcfc8dme05wfamr99tg2rfc6qdnpr79xmshyqy55jp5\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0004" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004" - "\"mock1vjlnyht39vfrdkeqfw5dp7jsr7ndvf2cd6pfafn88cc5ad7phdnsg86f0s\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap index 44cb71912..74b7aaa9b 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/native/ibc-client/src/contract.rs b/framework/contracts/native/ibc-client/src/contract.rs index 43939d592..f9ea3a0cb 100644 --- a/framework/contracts/native/ibc-client/src/contract.rs +++ b/framework/contracts/native/ibc-client/src/contract.rs @@ -223,6 +223,7 @@ mod tests { mod multi_hop_accounts { use super::*; use abstract_std::objects::{AccountId, AccountTrace, TruncatedChainId}; + use cosmwasm_std::Order; use std::str::FromStr; #[coverage_helper::test] @@ -245,12 +246,18 @@ mod tests { &remote_addr, )?; - let saved_addr = ACCOUNTS.load( - deps.as_mut().storage, - (account_id.trace(), account_id.seq(), &chain_name), - )?; + let saved_addr = ACCOUNTS + .range(deps.as_ref().storage, None, None, Order::Ascending) + .collect::, _>>() + .unwrap(); - assert_eq!(remote_addr, saved_addr); + assert_eq!( + saved_addr[0], + ( + (account_id.trace().clone(), account_id.seq(), chain_name), + remote_addr + ) + ); Ok(()) } diff --git a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap index ac5a705e4..d2f227fda 100644 --- a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap +++ b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap @@ -7,7 +7,7 @@ expression: all_storage - "{\"polytone_note\":\"mock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t\",\"remote_abstract_host\":\"host\",\"remote_proxy\":\"host\"}" - - "\u0000\u0002ebmock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t" - "\"remoteone\"" - - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0001a\u0000\u0004\u0000\u0000\u0000*remoteone" + - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000*remoteone" - "\"remote_account\"" - - contract_info - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" diff --git a/framework/packages/abstract-std/src/objects/account/account_id.rs b/framework/packages/abstract-std/src/objects/account/account_id.rs index 9faf3d083..4f95ae0f9 100644 --- a/framework/packages/abstract-std/src/objects/account/account_id.rs +++ b/framework/packages/abstract-std/src/objects/account/account_id.rs @@ -167,8 +167,6 @@ impl KeyDeserialize for &AccountId { fn from_vec(value: Vec) -> StdResult { let (trace, seq) = split_first_key(AccountTrace::KEY_ELEMS, value.as_ref())?; - println!("{:x?} - {:?}", trace, seq); - Ok(AccountId { seq: AccountSequence::from_vec(seq.to_vec())?, trace: AccountTrace::from_vec(trace)?, diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index bd4ef8526..e4954a6c4 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -17,7 +17,7 @@ pub enum AccountTrace { Remote(Vec), } -pub const ACCOUNT_TRACE_KEY_PLACEHOLDER: &[u8] = b"a"; +pub const ACCOUNT_TRACE_KEY_PLACEHOLDER: &[u8] = &[]; impl KeyDeserialize for &AccountTrace { type Output = AccountTrace; @@ -45,6 +45,16 @@ impl KeyDeserialize for &AccountTrace { } } +impl KeyDeserialize for AccountTrace { + type Output = AccountTrace; + const KEY_ELEMS: u16 = MAX_TRACE_LENGTH; + + #[inline(always)] + fn from_vec(value: Vec) -> StdResult { + <&AccountTrace>::from_vec(value) + } +} + impl<'a> PrimaryKey<'a> for AccountTrace { type Prefix = (); type SubPrefix = (); @@ -66,16 +76,6 @@ impl<'a> PrimaryKey<'a> for AccountTrace { } } -impl KeyDeserialize for AccountTrace { - type Output = AccountTrace; - const KEY_ELEMS: u16 = MAX_TRACE_LENGTH; - - #[inline(always)] - fn from_vec(value: Vec) -> StdResult { - <&AccountTrace>::from_vec(value) - } -} - impl<'a> Prefixer<'a> for AccountTrace { fn prefix(&self) -> Vec { self.key() From e73d458f348357c60fea53e5abe4509780ab934e Mon Sep 17 00:00:00 2001 From: Kayanski Date: Wed, 27 Nov 2024 09:25:58 +0000 Subject: [PATCH 18/25] Redice max trace length --- .../packages/abstract-std/src/objects/account/account_trace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index e4954a6c4..75ff75f99 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -6,7 +6,7 @@ use cw_storage_plus::{Key, KeyDeserialize, Prefixer, PrimaryKey}; use crate::{constants::CHAIN_DELIMITER, objects::TruncatedChainId, AbstractError}; -pub const MAX_TRACE_LENGTH: u16 = 6; +pub const MAX_TRACE_LENGTH: u16 = 4; pub(crate) const LOCAL: &str = "local"; /// The identifier of chain that triggered the account creation From 2ef51d5123df9e2cec1b4a81c8a6ffcd6fa57502 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Wed, 27 Nov 2024 09:28:30 +0000 Subject: [PATCH 19/25] Update snaps --- .../snapshots/adapters__account_install_adapter.snap | 8 ++++---- .../snapshots/adapters__install_one_adapter.snap | 8 ++++---- .../adapters__install_one_adapter_with_fee.snap | 8 ++++---- ...ing_specific_version_should_install_expected.snap | 8 ++++---- ...ters__reinstalling_adapter_should_be_allowed.snap | 8 ++++---- ...installing_new_version_should_install_latest.snap | 8 ++++---- .../tests/snapshots/apps__account_install_app.snap | 8 ++++---- .../tests/snapshots/apps__execute_on_account.snap | 6 +++--- ...tall_modules__adds_module_to_account_modules.snap | 8 ++++---- .../proxy__account_install_multiple_modules.snap | 4 ++-- .../proxy__account_install_standalone_modules.snap | 4 ++-- .../snapshots/proxy__account_with_response_data.snap | 8 ++++---- .../proxy__default_without_response_data.snap | 8 ++++---- .../tests/snapshots/proxy__exec_on_account.snap | 6 +++--- .../tests/snapshots/proxy__instantiate_account.snap | 6 +++--- ...ccount_updating_on_subaccount_should_succeed.snap | 8 ++++---- ...count__creating_on_subaccount_should_succeed.snap | 8 ++++---- ...ed_app_updating_on_subaccount_should_succeed.snap | 8 ++++---- ...ursive_updating_on_subaccount_should_succeed.snap | 10 +++++----- .../subaccount__sub_account_move_ownership.snap | 8 ++++---- ...t__sub_account_move_ownership_to_sub_account.snap | 12 ++++++------ ...count__updating_on_subaccount_should_succeed.snap | 8 ++++---- .../multihop_accounts__multihop_account.snap | 2 +- 23 files changed, 85 insertions(+), 85 deletions(-) diff --git a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap index 345596cf2..7f98768c0 100644 --- a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap index d55909063..081721c13 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap index 9f60b6896..ce458b3e2 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002cf\u0000\u0006tester\u0000\u000etest-module-id0.25.0" - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"ujunox\",\"amount\":\"45\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap index d9435a567..fa4115b10 100644 --- a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap +++ b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap index d55909063..081721c13 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap index b180c20d8..947a5a67d 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap @@ -79,17 +79,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap index 528bf7890..5bb32d514 100644 --- a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap +++ b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap index ad39cf961..857a7cb8a 100644 --- a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap +++ b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap index e3710c7ae..66966fe22 100644 --- a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap +++ b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap @@ -87,17 +87,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap index 431c3ea35..92ffd1a71 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap @@ -76,11 +76,11 @@ expression: all_storage - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"token1\",\"amount\":\"42\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - "\u0000\u0002cf\u0000\babstract\u0000\u000bstandalone21.0.0" - "{\"monetization\":\"none\",\"metadata\":null,\"instantiation_funds\":[{\"denom\":\"token1\",\"amount\":\"42\"},{\"denom\":\"token2\",\"amount\":\"500\"}]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap index 69683d56d..286e5bebb 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap @@ -72,11 +72,11 @@ expression: all_storage - "{\"namespace\":\"abstract\",\"name\":\"standalone1\",\"version\":{\"version\":\"1.0.0\"}}" - - "\u0000\u0002cc\u0000\u0000\u0000\u0000\u0000\u0000\u0000\f" - "{\"namespace\":\"abstract\",\"name\":\"standalone2\",\"version\":{\"version\":\"1.0.0\"}}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap index b585e1a10..899de0593 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap index 7508cfe4f..4b7188018 100644 --- a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap @@ -77,17 +77,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap index 568de7944..7adb8f8cd 100644 --- a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap index 568de7944..7adb8f8cd 100644 --- a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap @@ -71,13 +71,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap index 570f65342..28450a6b6 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap index c908c4245..058e4481b 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap index b3dc93ccb..d6462f5dd 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap index d1e9734f1..8a845e398 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap @@ -105,17 +105,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" - "\"mock1a5yd8d2ehutd0p65czuq2c44f8ur8026d39j7kkktxgtqu6fj9hsc9xes4\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap index c5145d269..ff227a152 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap @@ -86,15 +86,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap index ae83bd02d..6cd8a8620 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap @@ -120,19 +120,19 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" - "\"mock1jxw6zgzc92jrqtxfcfc8dme05wfamr99tg2rfc6qdnpr79xmshyqy55jp5\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004" - "\"mock1vjlnyht39vfrdkeqfw5dp7jsr7ndvf2cd6pfafn88cc5ad7phdnsg86f0s\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap index 74b7aaa9b..c443e5c50 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap @@ -88,15 +88,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap index d2f227fda..80dcfe9ea 100644 --- a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap +++ b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap @@ -7,7 +7,7 @@ expression: all_storage - "{\"polytone_note\":\"mock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t\",\"remote_abstract_host\":\"host\",\"remote_proxy\":\"host\"}" - - "\u0000\u0002ebmock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t" - "\"remoteone\"" - - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000*remoteone" + - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000*remoteone" - "\"remote_account\"" - - contract_info - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" From d1917607ee02e25871bfd232981c406022819c20 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Wed, 27 Nov 2024 17:17:16 +0000 Subject: [PATCH 20/25] Trace length back to 6 --- .../packages/abstract-std/src/objects/account/account_trace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 75ff75f99..e4954a6c4 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -6,7 +6,7 @@ use cw_storage_plus::{Key, KeyDeserialize, Prefixer, PrimaryKey}; use crate::{constants::CHAIN_DELIMITER, objects::TruncatedChainId, AbstractError}; -pub const MAX_TRACE_LENGTH: u16 = 4; +pub const MAX_TRACE_LENGTH: u16 = 6; pub(crate) const LOCAL: &str = "local"; /// The identifier of chain that triggered the account creation From 9f7bc8f849d68e906a5e8584ff1326bcc7a03ecb Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 17 Dec 2024 10:04:30 +0100 Subject: [PATCH 21/25] Finalize nits --- .../adapters__account_install_adapter.snap | 9 +++++---- .../snapshots/adapters__install_one_adapter.snap | 9 +++++---- .../adapters__install_one_adapter_with_fee.snap | 9 +++++---- ...ng_specific_version_should_install_expected.snap | 9 +++++---- ...ers__reinstalling_adapter_should_be_allowed.snap | 9 +++++---- ...nstalling_new_version_should_install_latest.snap | 9 +++++---- .../tests/snapshots/apps__account_install_app.snap | 9 +++++---- .../tests/snapshots/apps__execute_on_account.snap | 7 ++++--- ...all_modules__adds_module_to_account_modules.snap | 9 +++++---- .../proxy__account_install_multiple_modules.snap | 5 +++-- .../proxy__account_install_standalone_modules.snap | 5 +++-- .../proxy__account_with_response_data.snap | 9 +++++---- .../proxy__default_without_response_data.snap | 9 +++++---- .../tests/snapshots/proxy__exec_on_account.snap | 7 ++++--- .../tests/snapshots/proxy__instantiate_account.snap | 7 ++++--- ...count_updating_on_subaccount_should_succeed.snap | 9 +++++---- ...ount__creating_on_subaccount_should_succeed.snap | 9 +++++---- ...d_app_updating_on_subaccount_should_succeed.snap | 9 +++++---- ...rsive_updating_on_subaccount_should_succeed.snap | 11 ++++++----- .../subaccount__sub_account_move_ownership.snap | 9 +++++---- ...__sub_account_move_ownership_to_sub_account.snap | 13 +++++++------ ...ount__updating_on_subaccount_should_succeed.snap | 9 +++++---- .../multihop_accounts__multihop_account.snap | 3 ++- framework/docs/src/3_framework/8_ibc.md | 10 +++++----- framework/docs/src/ibc/account-ibc.md | 8 ++++++++ .../abstract-std/src/objects/account/account_id.rs | 6 +++--- .../src/objects/account/account_trace.rs | 13 ++++++++++--- 27 files changed, 134 insertions(+), 96 deletions(-) diff --git a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap index 7f98768c0..73de36865 100644 --- a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/adapters.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -77,17 +78,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap index 081721c13..ec24fb5e6 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/adapters.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -77,17 +78,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap index ce458b3e2..bf3cd47b8 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/adapters.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -79,17 +80,17 @@ expression: all_storage - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002cf\u0000\u0006tester\u0000\u000etest-module-id0.25.0" - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"ujunox\",\"amount\":\"45\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap index fa4115b10..3e3a78441 100644 --- a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap +++ b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/adapters.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -79,17 +80,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap index 081721c13..ec24fb5e6 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/adapters.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -77,17 +78,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap index 947a5a67d..a23d86429 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/adapters.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -79,17 +80,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap index 5bb32d514..2d01e4955 100644 --- a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap +++ b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/apps.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -77,17 +78,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap index 857a7cb8a..1268b25ba 100644 --- a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap +++ b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/apps.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -71,13 +72,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap index 66966fe22..88470a42d 100644 --- a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap +++ b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/install_modules.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -87,17 +88,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap index 92ffd1a71..d5aa5001b 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/proxy.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - "\u0000\u0002acabstract:standalone1" @@ -76,11 +77,11 @@ expression: all_storage - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"token1\",\"amount\":\"42\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - "\u0000\u0002cf\u0000\babstract\u0000\u000bstandalone21.0.0" - "{\"monetization\":\"none\",\"metadata\":null,\"instantiation_funds\":[{\"denom\":\"token1\",\"amount\":\"42\"},{\"denom\":\"token2\",\"amount\":\"500\"}]}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap index 286e5bebb..af8de19a5 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/proxy.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - "\u0000\u0002acabstract:standalone1" @@ -72,11 +73,11 @@ expression: all_storage - "{\"namespace\":\"abstract\",\"name\":\"standalone1\",\"version\":{\"version\":\"1.0.0\"}}" - - "\u0000\u0002cc\u0000\u0000\u0000\u0000\u0000\u0000\u0000\f" - "{\"namespace\":\"abstract\",\"name\":\"standalone2\",\"version\":{\"version\":\"1.0.0\"}}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap index 899de0593..454578c69 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/proxy.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -77,17 +78,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap index 4b7188018..1881d8e54 100644 --- a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/proxy.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -77,17 +78,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - "\u0000\u0002cjtester" - "{\"trace\":\"local\",\"seq\":1}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"tester\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap index 7adb8f8cd..7d9d72367 100644 --- a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/proxy.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -71,13 +72,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap index 7adb8f8cd..7d9d72367 100644 --- a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/proxy.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -71,13 +72,13 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap index 28450a6b6..131ee30a6 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/subaccount.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -88,15 +89,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap index 058e4481b..cdc16907d 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/subaccount.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -88,15 +89,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap index d6462f5dd..203cfd95d 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/subaccount.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -88,15 +89,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap index 8a845e398..61738467b 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/subaccount.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -105,17 +106,17 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" - "\"mock1a5yd8d2ehutd0p65czuq2c44f8ur8026d39j7kkktxgtqu6fj9hsc9xes4\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap index ff227a152..b405a1f2f 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/subaccount.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -86,15 +87,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap index 6cd8a8620..84e1a976d 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/subaccount.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -120,19 +121,19 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0003" - "\"mock1jxw6zgzc92jrqtxfcfc8dme05wfamr99tg2rfc6qdnpr79xmshyqy55jp5\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004" - "\"mock1vjlnyht39vfrdkeqfw5dp7jsr7ndvf2cd6pfafn88cc5ad7phdnsg86f0s\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap index c443e5c50..4267b5491 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap @@ -1,6 +1,7 @@ --- source: contracts/account/tests/subaccount.rs expression: all_storage +snapshot_kind: text --- "abstract:account-local-0": - - aa @@ -88,15 +89,15 @@ expression: all_storage - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0001" - "\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"" - - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" + - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002" - "\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"" - - "\u0000\u0002cjabstract" - "{\"trace\":\"local\",\"seq\":0}" - - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + - - "\u0000\u0002ck\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"abstract\"" - - cfg - "{\"security_enabled\":false,\"namespace_registration_fee\":null}" diff --git a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap index 80dcfe9ea..e28b6641e 100644 --- a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap +++ b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap @@ -1,13 +1,14 @@ --- source: contracts/native/ibc-client/tests/multihop_accounts.rs expression: all_storage +snapshot_kind: text --- "abstract:ibc-client": - - "\u0000\u0002earemoteone" - "{\"polytone_note\":\"mock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t\",\"remote_abstract_host\":\"host\",\"remote_proxy\":\"host\"}" - - "\u0000\u0002ebmock1mzdhwvvh22wrt07w59wxyd58822qavwkx5lcej7aqfkpqqlhaqfsetqc4t" - "\"remoteone\"" - - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000*remoteone" + - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000*remoteone" - "\"remote_account\"" - - contract_info - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" diff --git a/framework/docs/src/3_framework/8_ibc.md b/framework/docs/src/3_framework/8_ibc.md index 1c0a0bb7c..35e356cfd 100644 --- a/framework/docs/src/3_framework/8_ibc.md +++ b/framework/docs/src/3_framework/8_ibc.md @@ -95,23 +95,23 @@ created. This allows the account's owner to decide how messages should be routed flowchart LR subgraph Juno direction BT - Account([local:1]) + Account([local-1]) end subgraph Osmosis direction LR - Account --> ICAAOsmo([juno:1]) - ICAAOsmo2([juno>terra>archway:1]) + Account --> ICAAOsmo([juno-1]) + ICAAOsmo2([archway>terra>juno-1]) end subgraph Terra direction RL - Account --> ICAATerra([juno:1]) + Account --> ICAATerra([juno-1]) end subgraph Archway direction RL - ICAATerra --> ICAAArch([juno>terra:1]) + ICAATerra --> ICAAArch([terra>juno-1]) ICAAArch --> ICAAOsmo2 end direction TB diff --git a/framework/docs/src/ibc/account-ibc.md b/framework/docs/src/ibc/account-ibc.md index 578d0d576..1bfb1679f 100644 --- a/framework/docs/src/ibc/account-ibc.md +++ b/framework/docs/src/ibc/account-ibc.md @@ -84,6 +84,14 @@ The remote Interchain Abstract Account will have the same account sequence but w Remote accounts can create other remote accounts, and their traces will be chained. For instance, the `neutron-42` account on `Osmosis` can create an account on `Stargaze` which will have the ID `osmosis>neutron-42`. This gives the ability to trace ICAAs back to their origin chain. +```admonish warning +Note that in code, inside the `AccountTrace` struct, the trace is defined backwards, For account `osmosis>neutron-42`, the trace will be: + + AccountTrace::Remote(vec!["neutron", "osmosis"]) + +``` + + ### Sending messages on remote accounts diff --git a/framework/packages/abstract-std/src/objects/account/account_id.rs b/framework/packages/abstract-std/src/objects/account/account_id.rs index bf2eb9826..39ca668f6 100644 --- a/framework/packages/abstract-std/src/objects/account/account_id.rs +++ b/framework/packages/abstract-std/src/objects/account/account_id.rs @@ -161,7 +161,7 @@ impl Prefixer<'_> for AccountId { impl KeyDeserialize for &AccountId { type Output = AccountId; - const KEY_ELEMS: u16 = AccountId::KEY_ELEMS; + const KEY_ELEMS: u16 = AccountTrace::KEY_ELEMS + u32::KEY_ELEMS; #[inline(always)] fn from_vec(value: Vec) -> StdResult { @@ -176,7 +176,7 @@ impl KeyDeserialize for &AccountId { impl KeyDeserialize for AccountId { type Output = AccountId; - const KEY_ELEMS: u16 = AccountTrace::KEY_ELEMS + u32::KEY_ELEMS; + const KEY_ELEMS: u16 = <&AccountId>::KEY_ELEMS; #[inline(always)] fn from_vec(value: Vec) -> StdResult { @@ -252,7 +252,7 @@ mod test { fn mock_local_key() -> AccountId { AccountId { seq: 54, - trace: AccountTrace::Remote(vec![]), + trace: AccountTrace::Local, } } diff --git a/framework/packages/abstract-std/src/objects/account/account_trace.rs b/framework/packages/abstract-std/src/objects/account/account_trace.rs index 16d25c510..8d612c2f0 100644 --- a/framework/packages/abstract-std/src/objects/account/account_trace.rs +++ b/framework/packages/abstract-std/src/objects/account/account_trace.rs @@ -10,6 +10,13 @@ pub const MAX_TRACE_LENGTH: u16 = 6; pub(crate) const LOCAL: &str = "local"; /// The identifier of chain that triggered the account creation +/// +/// Note that the serialization to string and to Cw-storage-plus keys is different +/// +/// For String, `AccountTrace::Remote(vec!["neutron", "osmosis"])` will be serialized as `osmosis>neutron` +/// +/// For cw-storage-plus-key, `AccountTrace::Remote(vec!["neutron", "osmosis"])` will be serialized as `remote:["neutron", "osmosis", "", "", "", ""]` + #[cosmwasm_schema::cw_serde] pub enum AccountTrace { Local, @@ -21,7 +28,7 @@ pub const ACCOUNT_TRACE_KEY_PLACEHOLDER: &[u8] = &[]; impl KeyDeserialize for &AccountTrace { type Output = AccountTrace; - const KEY_ELEMS: u16 = AccountTrace::KEY_ELEMS; + const KEY_ELEMS: u16 = MAX_TRACE_LENGTH; #[inline(always)] fn from_vec(value: Vec) -> StdResult { @@ -47,7 +54,7 @@ impl KeyDeserialize for &AccountTrace { impl KeyDeserialize for AccountTrace { type Output = AccountTrace; - const KEY_ELEMS: u16 = MAX_TRACE_LENGTH; + const KEY_ELEMS: u16 = <&AccountTrace>::KEY_ELEMS; #[inline(always)] fn from_vec(value: Vec) -> StdResult { @@ -313,7 +320,7 @@ mod test { } fn mock_local_key() -> AccountTrace { - AccountTrace::Remote(vec![]) + AccountTrace::Local } fn mock_multi_hop_key() -> AccountTrace { From 54ddd192bd35a263db1b22faf7014b8513bcef80 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 17 Dec 2024 10:30:16 +0100 Subject: [PATCH 22/25] Changed versions --- framework/Cargo.lock | 69 +++------ framework/Cargo.toml | 22 ++- .../packages/abstract-adapter/Cargo.toml | 7 +- framework/packages/abstract-app/Cargo.toml | 8 +- framework/packages/abstract-client/Cargo.toml | 4 +- .../packages/abstract-interface/Cargo.toml | 14 +- .../packages/abstract-standalone/Cargo.toml | 2 +- framework/packages/standards/dex/Cargo.toml | 4 +- .../standards/money-market/Cargo.toml | 2 +- .../packages/standards/staking/Cargo.toml | 2 +- integrations/Cargo.toml | 87 ++++++------ integrations/bundles/mockdex/Cargo.toml | 13 +- integrations/wyndex-adapter/Cargo.toml | 5 +- interchain/Cargo.toml | 27 ++-- .../interchain-end_to_end_testing/Cargo.toml | 10 +- modules/Cargo.toml | 131 ++++++++---------- modules/contracts/apps/ping-pong/Cargo.toml | 2 +- 17 files changed, 181 insertions(+), 228 deletions(-) diff --git a/framework/Cargo.lock b/framework/Cargo.lock index ddada85f7..bee71375f 100644 --- a/framework/Cargo.lock +++ b/framework/Cargo.lock @@ -2,20 +2,9 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "absacc" -version = "0.0.0" -source = "git+https://github.com/burnt-labs/abstract-account.git?rev=4e376f2f399f17e50016a932d4e5af7336d952d7#4e376f2f399f17e50016a932d4e5af7336d952d7" -dependencies = [ - "cosmos-sdk-proto 0.23.0", - "cosmwasm-schema", - "cosmwasm-std", - "prost", -] - [[package]] name = "abstract-account" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-adapter", "abstract-ans-host", @@ -51,7 +40,7 @@ dependencies = [ [[package]] name = "abstract-adapter" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-adapter", "abstract-ibc-client", @@ -74,7 +63,7 @@ dependencies = [ [[package]] name = "abstract-adapter-utils" -version = "0.25.0" +version = "0.26.0" dependencies = [ "cosmwasm-std", "cw-asset", @@ -84,7 +73,7 @@ dependencies = [ [[package]] name = "abstract-ans-host" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-macros", "abstract-sdk", @@ -106,7 +95,7 @@ dependencies = [ [[package]] name = "abstract-app" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-app", "abstract-ibc-client", @@ -131,7 +120,7 @@ dependencies = [ [[package]] name = "abstract-client" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-account", "abstract-adapter", @@ -203,7 +192,7 @@ dependencies = [ [[package]] name = "abstract-dex-standard" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-adapter", "abstract-adapter-utils", @@ -227,7 +216,7 @@ dependencies = [ [[package]] name = "abstract-ibc-client" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-interface", "abstract-macros", @@ -254,7 +243,7 @@ dependencies = [ [[package]] name = "abstract-ibc-host" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-adapter", "abstract-interface", @@ -279,7 +268,7 @@ dependencies = [ [[package]] name = "abstract-ica" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-sdk", "abstract-testing", @@ -298,7 +287,7 @@ dependencies = [ [[package]] name = "abstract-ica-client" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-ica", "abstract-macros", @@ -319,7 +308,7 @@ dependencies = [ [[package]] name = "abstract-integration-tests" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-account", "abstract-adapter", @@ -339,7 +328,7 @@ dependencies = [ [[package]] name = "abstract-interface" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-account", "abstract-ans-host", @@ -380,7 +369,7 @@ dependencies = [ [[package]] name = "abstract-macros" -version = "0.25.0" +version = "0.26.0" dependencies = [ "cosmwasm-std", "proc-macro2", @@ -390,7 +379,7 @@ dependencies = [ [[package]] name = "abstract-module-factory" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-integration-tests", "abstract-interface", @@ -413,7 +402,7 @@ dependencies = [ [[package]] name = "abstract-money-market-standard" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-adapter", "abstract-adapter-utils", @@ -491,7 +480,7 @@ dependencies = [ [[package]] name = "abstract-registry" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-interface", "abstract-macros", @@ -513,7 +502,7 @@ dependencies = [ [[package]] name = "abstract-sdk" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-macros", "abstract-sdk", @@ -540,7 +529,7 @@ dependencies = [ [[package]] name = "abstract-staking-standard" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-adapter", "abstract-adapter-utils", @@ -564,7 +553,7 @@ dependencies = [ [[package]] name = "abstract-standalone" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-integration-tests", "abstract-interface", @@ -586,7 +575,7 @@ dependencies = [ [[package]] name = "abstract-std" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-testing", "anyhow", @@ -616,7 +605,7 @@ dependencies = [ [[package]] name = "abstract-testing" -version = "0.25.0" +version = "0.26.0" dependencies = [ "abstract-sdk", "abstract-std", @@ -633,9 +622,8 @@ dependencies = [ [[package]] name = "account" version = "0.1.0" -source = "git+https://github.com/abstractsdk/xion-contracts?branch=fix-for-abstract#6493190c7fa9259f5658c3cd5e608325052aedb3" +source = "git+https://github.com/burnt-labs/contracts#a9f1d3c752b9de4df6b87316a57b100522afef5b" dependencies = [ - "absacc", "base64 0.21.7", "bech32 0.9.1", "cosmos-sdk-proto 0.24.0-pre (git+https://github.com/burnt-labs/cosmos-rust.git?rev=75e72f446629f98330e209e2f6268250d325cccb)", @@ -1667,17 +1655,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "cosmos-sdk-proto" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2f63ab112b8c8e7b8a29c891adc48f43145beb21c0bfbf562957072c1e0beb" -dependencies = [ - "prost", - "prost-types", - "tendermint-proto 0.38.1", -] - [[package]] name = "cosmos-sdk-proto" version = "0.24.0-pre" diff --git a/framework/Cargo.toml b/framework/Cargo.toml index 993f17e8b..e84ce14d7 100644 --- a/framework/Cargo.toml +++ b/framework/Cargo.toml @@ -28,7 +28,7 @@ homepage = "https://abstract.money" keywords = ["cosmos", "cosmwasm", "framework"] license = "LGPL-3.0" repository = "https://github.com/AbstractSDK/abstract" -version = "0.25.0" +version = "0.26.0" [workspace.dependencies] cosmwasm-schema = { version = "2.0" } @@ -82,17 +82,17 @@ ibc-host = { package = "abstract-ibc-host", path = "contracts/native/ibc-host" abstract-account = { path = "contracts/account", default-features = false } -abstract-ica = { version = "0.25.0", path = "packages/abstract-ica" } -abstract-sdk = { version = "0.25.0", path = "packages/abstract-sdk" } -abstract-std = { version = "0.25.0", path = "packages/abstract-std" } -abstract-testing = { version = "0.25.0", path = "packages/abstract-testing" } -abstract-xion = { package = "account", version = "0.1.0", git = "https://github.com/abstractsdk/xion-contracts", features = ["library"], branch = "fix-for-abstract" } +abstract-ica = { version = "0.26.0", path = "packages/abstract-ica" } +abstract-sdk = { version = "0.26.0", path = "packages/abstract-sdk" } +abstract-std = { version = "0.26.0", path = "packages/abstract-std" } +abstract-testing = { version = "0.26.0", path = "packages/abstract-testing" } +abstract-xion = { package = "account", version = "0.1.0", git = "https://github.com/burnt-labs/contracts", features = ["library"] } # These should remain fixed and don't need to be re-published (unless changes are made) -abstract-macros = { version = "0.25.0", path = "packages/abstract-macros" } +abstract-macros = { version = "0.26.0", path = "packages/abstract-macros" } -abstract-adapter-utils = { version = "0.25.0", path = "packages/standards/utils" } +abstract-adapter-utils = { version = "0.26.0", path = "packages/standards/utils" } abstract-dex-standard = { path = "packages/standards/dex" } abstract-staking-standard = { path = "packages/standards/staking" } @@ -123,12 +123,6 @@ overflow-checks = true panic = 'abort' rpath = false -[patch.crates-io] - -# In case Polytone not released -# abstract-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -# abstract-polytone-note = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -# abstract-cw-orch-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } [workspace.metadata.cargo-udeps.ignore] # ensures CI doens't flag workspace-hack as unused dep diff --git a/framework/packages/abstract-adapter/Cargo.toml b/framework/packages/abstract-adapter/Cargo.toml index a5345f9d2..fd7b33dbd 100644 --- a/framework/packages/abstract-adapter/Cargo.toml +++ b/framework/packages/abstract-adapter/Cargo.toml @@ -31,9 +31,10 @@ schemars = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } # Keep this as a version and update when publishing new versions -abstract-ibc-client = { version = "0.25.0", path = "../../contracts/native/ibc-client", default-features = false } -abstract-ibc-host = { version = "0.25.0", path = "../../contracts/native/ibc-host", default-features = false } -abstract-interface = { path = "../../packages/abstract-interface", version = "0.25.0" } +# Default features only works on the workspace Cargo.toml, so using workspace = true is not possible here +abstract-ibc-client = { version = "0.26.0", path = "../../contracts/native/ibc-client", default-features = false } +abstract-ibc-host = { version = "0.26.0", path = "../../contracts/native/ibc-host", default-features = false } +abstract-interface = { path = "../../packages/abstract-interface", version = "0.26.0" } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] workspace-hack = { version = "0.1", path = "../../workspace-hack" } diff --git a/framework/packages/abstract-app/Cargo.toml b/framework/packages/abstract-app/Cargo.toml index 42cd34f67..4a10cb976 100644 --- a/framework/packages/abstract-app/Cargo.toml +++ b/framework/packages/abstract-app/Cargo.toml @@ -32,9 +32,11 @@ schemars = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } -abstract-ibc-client = { version = "0.25.0", path = "../../contracts/native/ibc-client", default-features = false } -abstract-ibc-host = { version = "0.25.0", path = "../../contracts/native/ibc-host", default-features = false } -abstract-interface = { version = "0.25.0", path = "../../packages/abstract-interface" } +# Keep this as a version and update when publishing new versions +# Default features only works on the workspace Cargo.toml, so using workspace = true is not possible here +abstract-ibc-client = { version = "0.26.0", path = "../../contracts/native/ibc-client", default-features = false } +abstract-ibc-host = { version = "0.26.0", path = "../../contracts/native/ibc-host", default-features = false } +abstract-interface = { version = "0.26.0", path = "../../packages/abstract-interface" } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] workspace-hack = { version = "0.1", path = "../../workspace-hack" } diff --git a/framework/packages/abstract-client/Cargo.toml b/framework/packages/abstract-client/Cargo.toml index dbd323438..0af3e22eb 100644 --- a/framework/packages/abstract-client/Cargo.toml +++ b/framework/packages/abstract-client/Cargo.toml @@ -9,7 +9,7 @@ license.workspace = true name = "abstract-client" readme = "README.md" repository.workspace = true -version = "0.25.0" +version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -22,7 +22,7 @@ interchain = ["dep:cw-orch-interchain", "abstract-interface/interchain"] test-utils = ["cw20", "cw20-base", "cw-plus-interface", "abstract-interface/testing"] [dependencies] -abstract-interface = { version = "0.25.0", path = "../abstract-interface" } +abstract-interface = { workspace = true } abstract-std.workspace = true cosmwasm-std.workspace = true cw-asset = { workspace = true } diff --git a/framework/packages/abstract-interface/Cargo.toml b/framework/packages/abstract-interface/Cargo.toml index 4f7938a3a..d45e24968 100644 --- a/framework/packages/abstract-interface/Cargo.toml +++ b/framework/packages/abstract-interface/Cargo.toml @@ -49,13 +49,13 @@ serde_json = "1.0.79" # Embed state.json in binary in release mode rust-embed = { version = "8.3.0", features = ["include-exclude"] } -# Keep these here -account = { version = "0.25.0", package = "abstract-account", path = "../../contracts/account", default-features = false } -ans-host = { version = "0.25.0", package = "abstract-ans-host", path = "../../contracts/native/ans-host", default-features = false } -ibc-client = { version = "0.25.0", package = "abstract-ibc-client", path = "../../contracts/native/ibc-client", default-features = false } -ibc-host = { version = "0.25.0", package = "abstract-ibc-host", path = "../../contracts/native/ibc-host", default-features = false } -module-factory = { version = "0.25.0", package = "abstract-module-factory", path = "../../contracts/native/module-factory", default-features = false } -registry = { version = "0.25.0", package = "abstract-registry", path = "../../contracts/native/registry", default-features = false } +# Keep these here. Default features only works on the workspace Cargo.toml, so using workspace = true is not possible here +account = { version = "0.26.0", package = "abstract-account", path = "../../contracts/account", default-features = false } +ans-host = { version = "0.26.0", package = "abstract-ans-host", path = "../../contracts/native/ans-host", default-features = false } +ibc-client = { version = "0.26.0", package = "abstract-ibc-client", path = "../../contracts/native/ibc-client", default-features = false } +ibc-host = { version = "0.26.0", package = "abstract-ibc-host", path = "../../contracts/native/ibc-host", default-features = false } +module-factory = { version = "0.26.0", package = "abstract-module-factory", path = "../../contracts/native/module-factory", default-features = false } +registry = { version = "0.26.0", package = "abstract-registry", path = "../../contracts/native/registry", default-features = false } workspace-hack = { version = "0.1", path = "../../workspace-hack" } # Predictable abstract addresses diff --git a/framework/packages/abstract-standalone/Cargo.toml b/framework/packages/abstract-standalone/Cargo.toml index 01458de3b..b6b21391b 100644 --- a/framework/packages/abstract-standalone/Cargo.toml +++ b/framework/packages/abstract-standalone/Cargo.toml @@ -28,7 +28,7 @@ semver = { workspace = true } thiserror = { workspace = true } # Interface -abstract-interface = { version = "0.25.0", path = "../../packages/abstract-interface" } +abstract-interface = { workspace = true } cw-orch = { workspace = true } # Testing diff --git a/framework/packages/standards/dex/Cargo.toml b/framework/packages/standards/dex/Cargo.toml index 8483b59c6..e156efaca 100644 --- a/framework/packages/standards/dex/Cargo.toml +++ b/framework/packages/standards/dex/Cargo.toml @@ -27,13 +27,13 @@ cw-address-like = { workspace = true } cw-asset = { workspace = true } thiserror = { workspace = true } -abstract-adapter = { version = "0.25.0", path = "../../abstract-adapter" } +abstract-adapter = { workspace = true } abstract-adapter-utils = { workspace = true } abstract-sdk = { workspace = true } abstract-std = { workspace = true } cw-orch = { workspace = true } -abstract-interface = { version = "0.25.0", path = "../../abstract-interface" } +abstract-interface = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] workspace-hack = { version = "0.1", path = "../../../workspace-hack" } diff --git a/framework/packages/standards/money-market/Cargo.toml b/framework/packages/standards/money-market/Cargo.toml index d96394456..7fa031622 100644 --- a/framework/packages/standards/money-market/Cargo.toml +++ b/framework/packages/standards/money-market/Cargo.toml @@ -25,7 +25,7 @@ cosmwasm-std = { workspace = true } cw-asset = { workspace = true } thiserror = { workspace = true } -abstract-adapter = { version = "0.25.0", path = "../../abstract-adapter" } +abstract-adapter = { workspace = true } abstract-adapter-utils = { workspace = true } abstract-sdk = { workspace = true } abstract-std = { workspace = true } diff --git a/framework/packages/standards/staking/Cargo.toml b/framework/packages/standards/staking/Cargo.toml index b65ba757f..13b5c22f1 100644 --- a/framework/packages/standards/staking/Cargo.toml +++ b/framework/packages/standards/staking/Cargo.toml @@ -24,7 +24,7 @@ cw-asset = { workspace = true } cw-utils = { workspace = true } thiserror = { workspace = true } -abstract-adapter = { version = "0.25.0", path = "../../abstract-adapter" } +abstract-adapter = { workspace = true } abstract-adapter-utils = { workspace = true } abstract-sdk = { workspace = true } abstract-std = { workspace = true } diff --git a/integrations/Cargo.toml b/integrations/Cargo.toml index 5c1abe444..daaa51a0a 100644 --- a/integrations/Cargo.toml +++ b/integrations/Cargo.toml @@ -24,70 +24,65 @@ homepage = "https://abstract.money" keywords = ["cosmos", "cosmwasm", "framework"] license = "GPL-3.0-or-later" repository = "https://github.com/AbstractSDK/abstract" -version = "0.25.0" +version = "0.26.0" [workspace.dependencies] cosmwasm-schema = { version = "2.0" } -cosmwasm-std = { version = "2.0" } +cosmwasm-std = { version = "2.0" } cw-address-like = { version = "2.0" } -cw-asset = { version = "4.0" } -cw-controllers = "2.0" -cw-orch = { version = "0.27.0" } -cw-ownable = { version = "2.0" } -cw-plus-orch = { version = "0.25.0" } +cw-asset = { version = "4.0" } +cw-controllers = "2.0" +cw-orch = { version = "0.27.0" } +cw-ownable = { version = "2.0" } +cw-plus-orch = { version = "0.25.0" } cw-storage-plus = "2.0.0" -cw-utils = "2.0" -cw2 = "2.0.0" -cw20 = { version = "2.0.0" } -cw20-base = { version = "2.0.0" } +cw-utils = "2.0" +cw2 = "2.0.0" +cw20 = { version = "2.0.0" } +cw20-base = { version = "2.0.0" } anyhow = "1.0" -chrono = { version = "0.4.31", default-features = false } -clap = { version = "4.0.32", features = ["derive"] } -protobuf = { version = "2", features = ["with-bytes"] } -schemars = "0.8" -semver = "1.0" -serde = { version = "1.0", default-features = false, features = ["derive"] } +chrono = { version = "0.4.31", default-features = false } +clap = { version = "4.0.32", features = ["derive"] } +protobuf = { version = "2", features = ["with-bytes"] } +schemars = "0.8" +semver = "1.0" +serde = { version = "1.0", default-features = false, features = ["derive"] } thiserror = { version = "1.0.50" } ## crates in order of publishing ## see docs/Publishing.md -abstract-adapter = { version = "0.25.0" } -abstract-interface = { version = "0.25.0" } -abstract-sdk = { version = "0.25.0" } -abstract-std = { version = "0.25.0" } +abstract-adapter = { version = "0.26.0" } +abstract-interface = { version = "0.26.0" } +abstract-sdk = { version = "0.26.0" } +abstract-std = { version = "0.26.0" } -abstract-adapter-utils = { version = "0.25.0" } -abstract-dex-standard = { version = "0.25.0" } -abstract-money-market-standard = { version = "0.25.0" } -abstract-staking-standard = { version = "0.25.0" } +abstract-adapter-utils = { version = "0.26.0" } +abstract-dex-standard = { version = "0.26.0" } +abstract-money-market-standard = { version = "0.26.0" } +abstract-staking-standard = { version = "0.26.0" } # TODO: REMOVE As soon as new dex-standard published [patch.crates-io] -abstract-adapter = { path = "../framework/packages/abstract-adapter" } -abstract-adapter-utils = { path = "../framework/packages/standards/utils" } -abstract-dex-standard = { path = "../framework/packages/standards/dex" } -abstract-interface = { path = "../framework/packages/abstract-interface" } -abstract-macros = { path = "../framework/packages/abstract-macros" } +abstract-adapter = { path = "../framework/packages/abstract-adapter" } +abstract-adapter-utils = { path = "../framework/packages/standards/utils" } +abstract-dex-standard = { path = "../framework/packages/standards/dex" } +abstract-interface = { path = "../framework/packages/abstract-interface" } +abstract-macros = { path = "../framework/packages/abstract-macros" } abstract-money-market-standard = { path = "../framework/packages/standards/money-market" } -abstract-sdk = { path = "../framework/packages/abstract-sdk" } -abstract-staking-standard = { path = "../framework/packages/standards/staking" } -abstract-std = { path = "../framework/packages/abstract-std" } - -# In case polytone not released -# abstract-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -# abstract-polytone-note = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -# abstract-cw-orch-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } +abstract-sdk = { path = "../framework/packages/abstract-sdk" } +abstract-staking-standard = { path = "../framework/packages/standards/staking" } +abstract-std = { path = "../framework/packages/abstract-std" } # Backup release profile, will result in warnings during optimization [profile.release] -codegen-units = 1 -debug = false +codegen-units = 1 +debug = false debug-assertions = false -incremental = false -lto = true -opt-level = 3 -overflow-checks = true -panic = 'abort' -rpath = false +incremental = false +lto = true +opt-level = 3 +overflow-checks = true +panic = 'abort' +rpath = false diff --git a/integrations/bundles/mockdex/Cargo.toml b/integrations/bundles/mockdex/Cargo.toml index 37fde4d22..74fb23445 100644 --- a/integrations/bundles/mockdex/Cargo.toml +++ b/integrations/bundles/mockdex/Cargo.toml @@ -1,4 +1,5 @@ [package] +# This package is not published edition = "2021" name = "mockdex-bundle" version = { workspace = true } @@ -8,12 +9,12 @@ version = { workspace = true } [dependencies] -cw-controllers = "2.0.0" -wyndex = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version="2.2.0" } -wyndex-factory = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version="2.2.0" } -wyndex-multi-hop = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version="2.2.0" } -wyndex-pair = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version="2.2.0" } -wyndex-stake = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version="2.2.0" } +cw-controllers = "2.0.0" +wyndex = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version = "2.2.0" } +wyndex-factory = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version = "2.2.0" } +wyndex-multi-hop = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version = "2.2.0" } +wyndex-pair = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version = "2.2.0" } +wyndex-stake = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", version = "2.2.0" } abstract-interface = { workspace = true, features = ["testing"] } abstract-std = { workspace = true } diff --git a/integrations/wyndex-adapter/Cargo.toml b/integrations/wyndex-adapter/Cargo.toml index 6ff7c6849..c9b4fcd0e 100644 --- a/integrations/wyndex-adapter/Cargo.toml +++ b/integrations/wyndex-adapter/Cargo.toml @@ -1,4 +1,5 @@ [package] +# This package is not published authors = ["Abstract Money "] description = "Abstract DexCommand implementation for Wyndex" edition = { workspace = true } @@ -21,8 +22,8 @@ full_integration = [ local = [] [dependencies] -wyndex = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", optional = true, version="2.2.0" } -wyndex-stake = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", features = ["library"], optional = true, version="2.2.0" } +wyndex = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", optional = true, version = "2.2.0" } +wyndex-stake = { git = "https://github.com/abstractsdk/wynddex", rev = "cbe316f17c4a89d0c3938ea66747a5ff1fc5a5e9", features = ["library"], optional = true, version = "2.2.0" } abstract-dex-standard = { workspace = true } abstract-sdk = { workspace = true } diff --git a/interchain/Cargo.toml b/interchain/Cargo.toml index 98b9e86bf..c2437596f 100644 --- a/interchain/Cargo.toml +++ b/interchain/Cargo.toml @@ -28,7 +28,7 @@ homepage = "https://abstract.money" keywords = ["cosmos", "cosmwasm", "framework"] license = "GPL-3.0-or-later" repository = "https://github.com/AbstractSDK/abstract" -version = "0.25.0" +version = "0.26.0" [workspace.dependencies] cosmwasm-schema = { version = "2.0" } @@ -65,15 +65,15 @@ cw-orch-proto = { version = "0.9.0" } # Keep these as path, creates cirular dependency otherwise # Only need to re-publish all contracts if a re-publish of abstract-interface is required -abstract-adapter = { version = "0.25.0", path = "../framework/packages/abstract-adapter" } -abstract-app = { version = "0.25.0", path = "../framework/packages/abstract-app" } -abstract-client = { version = "0.25.0", path = "../framework/packages/abstract-client" } -abstract-interface = { version = "0.25.0", path = "../framework/packages/abstract-interface" } -abstract-sdk = { version = "0.25.0", path = "../framework/packages/abstract-sdk" } -abstract-std = { version = "0.25.0", path = "../framework/packages/abstract-std" } -abstract-testing = { version = "0.25.0", path = "../framework/packages/abstract-testing" } +abstract-adapter = { version = "0.26.0", path = "../framework/packages/abstract-adapter" } +abstract-app = { version = "0.26.0", path = "../framework/packages/abstract-app" } +abstract-client = { version = "0.26.0", path = "../framework/packages/abstract-client" } +abstract-interface = { version = "0.26.0", path = "../framework/packages/abstract-interface" } +abstract-sdk = { version = "0.26.0", path = "../framework/packages/abstract-sdk" } +abstract-std = { version = "0.26.0", path = "../framework/packages/abstract-std" } +abstract-testing = { version = "0.26.0", path = "../framework/packages/abstract-testing" } # Modules -abstract-account = { version = "0.25.0", path = "../framework/contracts/account" } +abstract-account = { version = "0.26.0", path = "../framework/contracts/account" } # croncat-app = { path = "../modules/contracts/apps/croncat" } challenge-app = { path = "../modules/contracts/apps/challenge" } # dca-app = { path = "../modules/contracts/apps/dca" } @@ -102,17 +102,8 @@ abstract-staking-standard = { path = "../framework/packages/standards/staki abstract-std = { path = "../framework/packages/abstract-std" } abstract-testing = { path = "../framework/packages/abstract-testing" } -#TODO: remove after polytone release -abstract-cw-orch-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -abstract-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -abstract-polytone-note = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } # Backup release profile, will result in warnings during optimization - -[patch.'https://github.com/AbstractSDK/cw-orchestrator'] -cw-orch = { version = "0.26.0" } -cw-orch-interchain = { version = "=0.7.2" } - [profile.release] codegen-units = 1 debug = false diff --git a/interchain/interchain-end_to_end_testing/Cargo.toml b/interchain/interchain-end_to_end_testing/Cargo.toml index c0bbfdc03..89f05e3ee 100644 --- a/interchain/interchain-end_to_end_testing/Cargo.toml +++ b/interchain/interchain-end_to_end_testing/Cargo.toml @@ -1,9 +1,9 @@ [package] -description = "Interchain testing library for the Abstract SDK. This is used primarily for tests but some elements are re-usable for testing apps and adapters" -edition = { workspace = true } -license = { workspace = true } -name = "abstract-interchain-tests" -version = "0.25.0" +description = "Interchain testing library for the Abstract SDK. This is used primarily for tests but some elements are re-usable for testing apps and adapters" +edition = { workspace = true } +license = { workspace = true } +name = "abstract-interchain-tests" +version.workspace = true [lib] diff --git a/modules/Cargo.toml b/modules/Cargo.toml index 048abb717..3c202d90d 100644 --- a/modules/Cargo.toml +++ b/modules/Cargo.toml @@ -1,10 +1,6 @@ [workspace] exclude = ["contracts/apps/croncat", "contracts/apps/dca"] -members = [ - "contracts/apps/*", - "contracts/adapters/*", - "contracts/standalones/*", -] +members = ["contracts/apps/*", "contracts/adapters/*", "contracts/standalones/*"] resolver = "2" @@ -20,73 +16,73 @@ homepage = "https://abstract.money" keywords = ["cosmos", "cosmwasm", "framework"] license = "GPL-3.0-or-later" repository = "https://github.com/AbstractSDK/abstract" -version = "0.25.0" +version = "0.26.0" [workspace.dependencies] cosmwasm-schema = { version = "2.0" } -cosmwasm-std = { version = "2.0" } +cosmwasm-std = { version = "2.0" } cw-address-like = { version = "2.0" } -cw-asset = { version = "4.0" } -cw-controllers = { version = "2.0" } -cw-ownable = { version = "2.0" } -cw-plus-orch = { version = "0.25.0" } +cw-asset = { version = "4.0" } +cw-controllers = { version = "2.0" } +cw-ownable = { version = "2.0" } +cw-plus-orch = { version = "0.25.0" } cw-storage-plus = "2.0.0" -cw-utils = { version = "2.0" } -cw2 = { version = "2.0" } -cw20 = { version = "2.0.0" } -cw20-base = { features = ["library"], version = "2.0.0" } - -protobuf = { version = "2", features = ["with-bytes"] } -schemars = "0.8" -serde = { version = "1.0", default-features = false, features = ["derive"] } +cw-utils = { version = "2.0" } +cw2 = { version = "2.0" } +cw20 = { version = "2.0.0" } +cw20-base = { features = ["library"], version = "2.0.0" } + +protobuf = { version = "2", features = ["with-bytes"] } +schemars = "0.8" +serde = { version = "1.0", default-features = false, features = ["derive"] } thiserror = { version = "1.0.50" } chrono = { version = "0.4.31", default-features = false } -clap = { version = "4.0.32", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } semver = "1.0" -cw-orch = { version = "0.27.0" } -cw-orch-interchain = { version = "0.8.0" } -cw-orch-osmosis-test-tube = { version = "0.5.0" } +cw-orch = { version = "0.27.0" } +cw-orch-interchain = { version = "0.8.0" } cw-orch-neutron-test-tube = { version = "0.2.0" } -tokio = { version = "1.4", features = ["full"] } +cw-orch-osmosis-test-tube = { version = "0.5.0" } +tokio = { version = "1.4", features = ["full"] } ## crates in order of publishing ## see docs/Publishing.md -abstract-adapter = { version = "0.25.0" } -abstract-app = { version = "0.25.0" } -abstract-client = { version = "0.25.0" } -abstract-interface = { version = "0.25.0" } -abstract-macros = { version = "0.25.0" } -abstract-standalone = { version = "0.25.0" } -abstract-testing = { version = "0.25.0" } +abstract-adapter = { version = "0.26.0" } +abstract-app = { version = "0.26.0" } +abstract-client = { version = "0.26.0" } abstract-integration-tests = { path = "../framework/packages/abstract-integration-tests" } +abstract-interface = { version = "0.26.0" } +abstract-macros = { version = "0.26.0" } +abstract-standalone = { version = "0.26.0" } +abstract-testing = { version = "0.26.0" } -abstract-adapter-utils = { version = "0.25.0" } -abstract-dex-standard = { version = "0.25.0" } -abstract-money-market-standard = { version = "0.25.0" } -abstract-staking-standard = { version = "0.25.0" } +abstract-adapter-utils = { version = "0.26.0" } +abstract-dex-standard = { version = "0.26.0" } +abstract-money-market-standard = { version = "0.26.0" } +abstract-staking-standard = { version = "0.26.0" } # Integrations -abstract-astroport-adapter = { path = "../integrations/astroport-adapter", default-features = false } -abstract-astrovault-adapter = { path = "../integrations/astrovault-adapter", default-features = false } -abstract-kujira-adapter = { path = "../integrations/kujira-adapter", default-features = false } -abstract-mars-adapter = { path = "../integrations/mars-adapter", default-features = false } -abstract-osmosis-adapter = { path = "../integrations/osmosis-adapter", default-features = false } -abstract-wyndex-adapter = { path = "../integrations/wyndex-adapter", default-features = false } +abstract-astroport-adapter = { path = "../integrations/astroport-adapter", default-features = false } +abstract-astrovault-adapter = { path = "../integrations/astrovault-adapter", default-features = false } +abstract-kujira-adapter = { path = "../integrations/kujira-adapter", default-features = false } +abstract-mars-adapter = { path = "../integrations/mars-adapter", default-features = false } abstract-neutron-dex-adapter = { path = "../integrations/neutron-dex-adapter", default-features = false } +abstract-osmosis-adapter = { path = "../integrations/osmosis-adapter", default-features = false } +abstract-wyndex-adapter = { path = "../integrations/wyndex-adapter", default-features = false } mockdex-bundle = { path = "../integrations/bundles/mockdex" } ## Modules -abstract-cw-staking = { path = "./contracts/adapters/cw-staking", default-features = false } +abstract-cw-staking = { path = "./contracts/adapters/cw-staking", default-features = false } abstract-dex-adapter = { path = "./contracts/adapters/dex", default-features = false } -challenge-app = { path = "./contracts/apps/challenge", default-features = false } -croncat-app = { path = "./contracts/apps/croncat", default-features = false } -dca-app = { path = "./contracts/apps/dca", default-features = false } +challenge-app = { path = "./contracts/apps/challenge", default-features = false } +croncat-app = { path = "./contracts/apps/croncat", default-features = false } +dca-app = { path = "./contracts/apps/dca", default-features = false } ## Testing anyhow = "1" @@ -94,33 +90,28 @@ rstest = "0.17.0" # this ensures local compatability when compiling locally [patch.crates-io] -abstract-adapter = { path = "../framework/packages/abstract-adapter" } -abstract-adapter-utils = { path = "../framework/packages/standards/utils" } -abstract-app = { path = "../framework/packages/abstract-app" } -abstract-client = { path = "../framework/packages/abstract-client" } -abstract-dex-standard = { path = "../framework/packages/standards/dex" } -abstract-interface = { path = "../framework/packages/abstract-interface" } -abstract-macros = { path = "../framework/packages/abstract-macros" } +abstract-adapter = { path = "../framework/packages/abstract-adapter" } +abstract-adapter-utils = { path = "../framework/packages/standards/utils" } +abstract-app = { path = "../framework/packages/abstract-app" } +abstract-client = { path = "../framework/packages/abstract-client" } +abstract-dex-standard = { path = "../framework/packages/standards/dex" } +abstract-interface = { path = "../framework/packages/abstract-interface" } +abstract-macros = { path = "../framework/packages/abstract-macros" } abstract-money-market-standard = { path = "../framework/packages/standards/money-market" } -abstract-sdk = { path = "../framework/packages/abstract-sdk" } -abstract-staking-standard = { path = "../framework/packages/standards/staking" } -abstract-standalone = { path = "../framework/packages/abstract-standalone" } -abstract-std = { path = "../framework/packages/abstract-std" } -abstract-testing = { path = "../framework/packages/abstract-testing" } - -# In case polytone not released -# abstract-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -# abstract-polytone-note = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } -# abstract-cw-orch-polytone = { git = "https://github.com/AbstractSDK/polytone.git", branch = "bump/cw2" } +abstract-sdk = { path = "../framework/packages/abstract-sdk" } +abstract-staking-standard = { path = "../framework/packages/standards/staking" } +abstract-standalone = { path = "../framework/packages/abstract-standalone" } +abstract-std = { path = "../framework/packages/abstract-std" } +abstract-testing = { path = "../framework/packages/abstract-testing" } # Backup release profile, will result in warnings during optimization [profile.release] -codegen-units = 1 -debug = false +codegen-units = 1 +debug = false debug-assertions = false -incremental = false -lto = true -opt-level = 3 -overflow-checks = true -panic = 'abort' -rpath = false +incremental = false +lto = true +opt-level = 3 +overflow-checks = true +panic = 'abort' +rpath = false diff --git a/modules/contracts/apps/ping-pong/Cargo.toml b/modules/contracts/apps/ping-pong/Cargo.toml index 38b119b4c..26c278577 100644 --- a/modules/contracts/apps/ping-pong/Cargo.toml +++ b/modules/contracts/apps/ping-pong/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] abstract-app = { workspace = true } -abstract-ibc-client = { version = "0.25.0", default-features = false, path = "../../../../framework/contracts/native/ibc-client" } +abstract-ibc-client = { version = "0.26.0", default-features = false, path = "../../../../framework/contracts/native/ibc-client" } cosmwasm-schema = { workspace = true } cosmwasm-std = { workspace = true } cw-asset = { workspace = true } From b6aed361e18c5766ad03ef3a4137dcca98e810ba Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 17 Dec 2024 10:36:04 +0100 Subject: [PATCH 23/25] snaps --- .../adapters__account_install_adapter.snap | 28 +++++++------- .../adapters__install_one_adapter.snap | 36 +++++++++--------- ...dapters__install_one_adapter_with_fee.snap | 38 +++++++++---------- ...cific_version_should_install_expected.snap | 28 +++++++------- ...einstalling_adapter_should_be_allowed.snap | 36 +++++++++--------- ...ing_new_version_should_install_latest.snap | 28 +++++++------- .../snapshots/apps__account_install_app.snap | 28 +++++++------- .../snapshots/apps__execute_on_account.snap | 28 +++++++------- ...dules__adds_module_to_account_modules.snap | 28 +++++++------- ...oxy__account_install_multiple_modules.snap | 26 ++++++------- ...y__account_install_standalone_modules.snap | 26 ++++++------- .../proxy__account_with_response_data.snap | 36 +++++++++--------- .../proxy__default_without_response_data.snap | 36 +++++++++--------- .../snapshots/proxy__exec_on_account.snap | 28 +++++++------- .../snapshots/proxy__instantiate_account.snap | 28 +++++++------- ...updating_on_subaccount_should_succeed.snap | 30 +++++++-------- ...creating_on_subaccount_should_succeed.snap | 30 +++++++-------- ...updating_on_subaccount_should_succeed.snap | 30 +++++++-------- ...updating_on_subaccount_should_succeed.snap | 32 ++++++++-------- ...ubaccount__sub_account_move_ownership.snap | 30 +++++++-------- ...account_move_ownership_to_sub_account.snap | 34 ++++++++--------- ...updating_on_subaccount_should_succeed.snap | 30 +++++++-------- .../multihop_accounts__multihop_account.snap | 4 +- 23 files changed, 339 insertions(+), 339 deletions(-) diff --git a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap index 73de36865..e7ce1e71a 100644 --- a/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__account_install_adapter.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -34,7 +34,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,40 +43,40 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - "\u0000\u0002cb\u0000\u0006tester\u0000\rmock-adapter11.0.0" - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -95,7 +95,7 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:mock-adapter1": diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap index ec24fb5e6..1c4f7ca89 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,11 +30,11 @@ snapshot_kind: text - - ag - "{\"trace\":\"local\",\"seq\":1}" - - ah - - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.25.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" + - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.26.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,40 +43,40 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.25.0" + - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.26.0" - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -95,15 +95,15 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:test-module-id": - - base_state - "{\"code_id\":9}" - - contract_info - - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.26.0\"}" - - ibc_callback_received - "false" - - mod - - "{\"module\":\"tester:test-module-id\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" + - "{\"module\":\"tester:test-module-id\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" diff --git a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap index bf3cd47b8..73824a34f 100644 --- a/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap +++ b/framework/contracts/account/tests/snapshots/adapters__install_one_adapter_with_fee.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,11 +30,11 @@ snapshot_kind: text - - ag - "{\"trace\":\"local\",\"seq\":1}" - - ah - - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.25.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" + - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.26.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,42 +43,42 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.25.0" + - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.26.0" - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - - "\u0000\u0002cf\u0000\u0006tester\u0000\u000etest-module-id0.25.0" + - - "\u0000\u0002cf\u0000\u0006tester\u0000\u000etest-module-id0.26.0" - "{\"monetization\":{\"install_fee\":{\"fee\":{\"denom\":\"ujunox\",\"amount\":\"45\"}}},\"metadata\":null,\"instantiation_funds\":[]}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -97,15 +97,15 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:test-module-id": - - base_state - "{\"code_id\":9}" - - contract_info - - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.26.0\"}" - - ibc_callback_received - "false" - - mod - - "{\"module\":\"tester:test-module-id\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" + - "{\"module\":\"tester:test-module-id\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" diff --git a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap index 3e3a78441..311123b78 100644 --- a/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap +++ b/framework/contracts/account/tests/snapshots/adapters__installing_specific_version_should_install_expected.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -34,7 +34,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,24 +43,24 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": @@ -68,17 +68,17 @@ snapshot_kind: text - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - "\u0000\u0002cb\u0000\u0006tester\u0000\rmock-adapter12.0.0" - "{\"adapter\":\"mock13nrd2qag9dww078z9a2way4kvzpr0k5dkv54e2xfmp2e2decfmjq4g06hw\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -97,7 +97,7 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:mock-adapter1": diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap index ec24fb5e6..1c4f7ca89 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_adapter_should_be_allowed.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,11 +30,11 @@ snapshot_kind: text - - ag - "{\"trace\":\"local\",\"seq\":1}" - - ah - - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.25.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" + - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.26.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,40 +43,40 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.25.0" + - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.26.0" - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -95,15 +95,15 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:test-module-id": - - base_state - "{\"code_id\":9}" - - contract_info - - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.26.0\"}" - - ibc_callback_received - "false" - - mod - - "{\"module\":\"tester:test-module-id\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" + - "{\"module\":\"tester:test-module-id\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" diff --git a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap index a23d86429..1a33b4ded 100644 --- a/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap +++ b/framework/contracts/account/tests/snapshots/adapters__reinstalling_new_version_should_install_latest.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -34,7 +34,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,24 +43,24 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": @@ -68,17 +68,17 @@ snapshot_kind: text - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - "\u0000\u0002cb\u0000\u0006tester\u0000\rmock-adapter12.0.0" - "{\"adapter\":\"mock13nrd2qag9dww078z9a2way4kvzpr0k5dkv54e2xfmp2e2decfmjq4g06hw\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -97,7 +97,7 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:mock-adapter1": diff --git a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap index 2d01e4955..33a1173bb 100644 --- a/framework/contracts/account/tests/snapshots/apps__account_install_app.snap +++ b/framework/contracts/account/tests/snapshots/apps__account_install_app.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -34,7 +34,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,40 +43,40 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - "\u0000\u0002cb\u0000\u0006tester\u0000\u0003app1.0.0" - "{\"app\":11}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -95,7 +95,7 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:app": diff --git a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap index 1268b25ba..dc90c900d 100644 --- a/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap +++ b/framework/contracts/account/tests/snapshots/apps__execute_on_account.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,7 +30,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -39,38 +39,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -85,6 +85,6 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap index 88470a42d..757c86c7b 100644 --- a/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap +++ b/framework/contracts/account/tests/snapshots/install_modules__adds_module_to_account_modules.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -34,7 +34,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,24 +43,24 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": @@ -76,17 +76,17 @@ snapshot_kind: text - "{\"adapter\":\"mock1k9z7fvd3307ynapnk5gjffn706mz8qck502f7qwgt2a2a35kgqlqsv5ehm\"}" - - "\u0000\u0002cb\u0000\u0006tester\u0000\rmock-adapter22.0.0" - "{\"adapter\":\"mock1d2wr6ej95xepd3wmmpgrkyxwjns6gt5tfscrr3jcuetz7m7z0req77w6zq\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -105,7 +105,7 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:mock-adapter1": diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap index d5aa5001b..294cb98c3 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_multiple_modules.snap @@ -21,7 +21,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -30,44 +30,44 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - da - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000bstandalone11.0.0" - "{\"standalone\":11}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000bstandalone21.0.0" - "{\"standalone\":12}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002cc\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u000b" - "{\"namespace\":\"abstract\",\"name\":\"standalone1\",\"version\":{\"version\":\"1.0.0\"}}" @@ -88,6 +88,6 @@ snapshot_kind: text - - ci - "1" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap index af8de19a5..37714ae46 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_install_standalone_modules.snap @@ -21,7 +21,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -30,44 +30,44 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - da - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000bstandalone11.0.0" - "{\"standalone\":11}" - - "\u0000\u0002cb\u0000\babstract\u0000\u000bstandalone21.0.0" - "{\"standalone\":12}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002cc\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u000b" - "{\"namespace\":\"abstract\",\"name\":\"standalone1\",\"version\":{\"version\":\"1.0.0\"}}" @@ -84,6 +84,6 @@ snapshot_kind: text - - ci - "1" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap index 454578c69..d1deafcd9 100644 --- a/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__account_with_response_data.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,11 +30,11 @@ snapshot_kind: text - - ag - "{\"trace\":\"local\",\"seq\":1}" - - ah - - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.25.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" + - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.26.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,40 +43,40 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.25.0" + - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.26.0" - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -95,7 +95,7 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:test-module-id": @@ -104,8 +104,8 @@ snapshot_kind: text - - base_state - "{\"code_id\":9}" - - contract_info - - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.26.0\"}" - - ibc_callback_received - "false" - - mod - - "{\"module\":\"tester:test-module-id\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" + - "{\"module\":\"tester:test-module-id\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" diff --git a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap index 1881d8e54..16a7f72cd 100644 --- a/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap +++ b/framework/contracts/account/tests/snapshots/proxy__default_without_response_data.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,11 +30,11 @@ snapshot_kind: text - - ag - "{\"trace\":\"local\",\"seq\":1}" - - ah - - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.25.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" + - "[[{\"info\":{\"namespace\":\"tester\",\"name\":\"test-module-id\",\"version\":{\"version\":\"0.26.0\"}},\"reference\":{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}},null]]" - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -43,40 +43,40 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.25.0" + - - "\u0000\u0002cb\u0000\u0006tester\u0000\u000etest-module-id0.26.0" - "{\"adapter\":\"mock1ds5m6wwuu0cr35kmhxmq3up2w0tamsplnna3wm0dkxnyu5x8k03sux5d63\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -95,15 +95,15 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "tester:test-module-id": - - base_state - "{\"code_id\":9}" - - contract_info - - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"tester:test-module-id\",\"version\":\"0.26.0\"}" - - ibc_callback_received - "false" - - mod - - "{\"module\":\"tester:test-module-id\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" + - "{\"module\":\"tester:test-module-id\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":\"test_metadata\"}" diff --git a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap index 7d9d72367..bd3f77c6e 100644 --- a/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__exec_on_account.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,7 +30,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -39,38 +39,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -85,6 +85,6 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap index 7d9d72367..bd3f77c6e 100644 --- a/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap +++ b/framework/contracts/account/tests/snapshots/proxy__instantiate_account.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,7 +30,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -39,38 +39,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -85,6 +85,6 @@ snapshot_kind: text - - ci - "2" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap index 131ee30a6..acc091588 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__account_updating_on_subaccount_should_succeed.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -32,7 +32,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-2": @@ -47,7 +47,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -56,38 +56,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -104,6 +104,6 @@ snapshot_kind: text - - ci - "3" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap index cdc16907d..7cfadd8ed 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__creating_on_subaccount_should_succeed.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -32,7 +32,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-2": @@ -47,7 +47,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -56,38 +56,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -104,6 +104,6 @@ snapshot_kind: text - - ci - "3" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap index 203cfd95d..19b31a7f1 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__installed_app_updating_on_subaccount_should_succeed.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -32,7 +32,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-2": @@ -47,7 +47,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -56,38 +56,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -104,6 +104,6 @@ snapshot_kind: text - - ci - "3" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap index 61738467b..faed78b96 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__recursive_updating_on_subaccount_should_succeed.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -32,7 +32,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-2": @@ -49,7 +49,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-3": @@ -64,7 +64,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -73,38 +73,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -123,6 +123,6 @@ snapshot_kind: text - - ci - "4" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap index b405a1f2f..dad5a64b5 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -30,7 +30,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-2": @@ -45,7 +45,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1lk0ans8sykcdtc2u6ep502pjm6m2ep4aqe9qsupg5hwpweg4mxxqjgke6h\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -54,38 +54,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -102,6 +102,6 @@ snapshot_kind: text - - ci - "3" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap index 84e1a976d..176d3759a 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__sub_account_move_ownership_to_sub_account.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -32,7 +32,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-2": @@ -49,7 +49,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-3": @@ -64,7 +64,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-4": @@ -79,7 +79,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1zrcvn33rptsj7t6hacjrhuekqplf8eagqs3dg7m9vqqrhnyaxtxsa9tlkx\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -88,38 +88,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -140,6 +140,6 @@ snapshot_kind: text - - ci - "5" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap index 4267b5491..cd413765f 100644 --- a/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap +++ b/framework/contracts/account/tests/snapshots/subaccount__updating_on_subaccount_should_succeed.snap @@ -15,7 +15,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-1": @@ -32,7 +32,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"monarchy\":{\"monarch\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:account-local-2": @@ -47,7 +47,7 @@ snapshot_kind: text - - ai - "[]" - - contract_info - - "{\"contract\":\"abstract:account\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:account\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":{\"sub_account\":{\"account\":\"mock1jdl4tasw0x00k2edyf8656lqxy95gx06h2nt5n8qjzv45yxr5ekq0myk0q\"}},\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ans-host": @@ -56,38 +56,38 @@ snapshot_kind: text - - cfg - "{\"next_unique_pool_id\":1}" - - contract_info - - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ans-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-client": - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:ibc-host": - - contract_info - - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-host\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:module-factory": - - contract_info - - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:module-factory\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" "abstract:registry": - - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u0007account0.26.0" - "{\"account\":5}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bans-host0.26.0" - "{\"native\":\"mock1awvrj8fm7khxxfllk06hqehrh6kg4m2wakt9x5w4zjmpwrgjx02snv3vdy\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bibc-host0.26.0" - "{\"native\":\"mock1aaf9r6s7nxhysuegqrxv0wpm27ypyv4886medd3mrkrw6t4yfcns7ctvz5\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\bregistry0.26.0" - "{\"native\":\"mock1h9wzw84sqsmkylh43j64wdduww9l7xdznfptkqe3e0ytf3vx9h7quplk0z\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\nibc-client0.26.0" - "{\"native\":\"mock16jzpxp0e8550c9aht6q9svcux30vtyyyyxv5w2l2djjra46580wsgtnl4n\"}" - - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.25.0" + - - "\u0000\u0002cb\u0000\babstract\u0000\u000emodule-factory0.26.0" - "{\"native\":\"mock1lhx5jj47nwa64t4465szhxmdrehffpu8t5jjvhkat7yyqjtajdcszw3kpq\"}" - - "\u0000\u0002ch\u0000\u0005local\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - "\"mock15n6av559ra8s98xgfnhc23d7vzr207q2j2m7cht5hrchw9mjc09qag5hf6\"" @@ -104,6 +104,6 @@ snapshot_kind: text - - ci - "3" - - contract_info - - "{\"contract\":\"abstract:registry\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:registry\",\"version\":\"0.26.0\"}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" diff --git a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap index e28b6641e..4875b1676 100644 --- a/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap +++ b/framework/contracts/native/ibc-client/tests/snapshots/multihop_accounts__multihop_account.snap @@ -11,8 +11,8 @@ snapshot_kind: text - - "\u0000\u0002ec\u0000\tremoteone\u0000\tremotetwo\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0004\u0000\u0000\u0000*remoteone" - "\"remote_account\"" - - contract_info - - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.25.0\"}" + - "{\"contract\":\"abstract:ibc-client\",\"version\":\"0.26.0\"}" - - mod - - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.25.0\",\"dependencies\":[],\"metadata\":null}" + - "{\"module\":\"abstract:ibc-client\",\"version\":\"0.26.0\",\"dependencies\":[],\"metadata\":null}" - - ownership - "{\"owner\":\"mock1pgm8hyk0pvphmlvfjc8wsvk4daluz5tgrw6pu5mfpemk74uxnx9qwrtv4f\",\"pending_owner\":null,\"pending_expiry\":null}" From 84927ed87c3803e00a02c6cec7627682a9cd57bc Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 17 Dec 2024 11:02:26 +0100 Subject: [PATCH 24/25] Reset because not verified --- .circleci/config.yml | 36 ++++++++++++++--------------- framework/workspace-hack/Cargo.toml | 10 ++++---- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 902f4995d..a13108332 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,7 @@ jobs: build-framework: docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.83.0 resource_class: xlarge steps: - setup_remote_docker @@ -157,7 +157,7 @@ jobs: git checkout "$CIRCLE_BRANCH-build" - restore_cache: keys: - - cargocache-v2-build-rust:1.80.0-{{ checksum "framework/Cargo.lock" }} + - cargocache-v2-build-rust:1.83.0-{{ checksum "framework/Cargo.lock" }} - run: name: Build framework WASM artifacts command: | @@ -170,7 +170,7 @@ jobs: - framework/target/debug/.fingerprint - framework/target/debug/build - framework/target/debug/deps - key: cargocache-v2-build-rust:1.80.0-{{ checksum "framework/Cargo.lock" }} + key: cargocache-v2-build-rust:1.83.0-{{ checksum "framework/Cargo.lock" }} - run: name: Import GPG Key command: | @@ -203,7 +203,7 @@ jobs: build-modules: docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.83.0 resource_class: xlarge steps: - setup_remote_docker @@ -271,7 +271,7 @@ jobs: build-schemas: docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.83.0 resource_class: xlarge steps: - setup_remote_docker @@ -297,7 +297,7 @@ jobs: git checkout "$CIRCLE_BRANCH-build" - restore_cache: keys: - - cargocache-v2-build-rust:1.80.0-{{ checksum "framework/Cargo.lock" }} + - cargocache-v2-build-rust:1.83.0-{{ checksum "framework/Cargo.lock" }} - run: name: Generate schemas command: | @@ -370,7 +370,7 @@ jobs: tests: docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.83.0 resource_class: xlarge steps: - checkout @@ -381,7 +381,7 @@ jobs: cargo generate-lockfile - restore_cache: keys: - - cargocache-v2-tests-rust:1.80.0-{{ checksum "modules/Cargo.lock" }} + - cargocache-v2-tests-rust:1.83.0-{{ checksum "modules/Cargo.lock" }} - run: name: Modules tests command: | @@ -392,11 +392,11 @@ jobs: - modules/target/debug/.fingerprint - modules/target/debug/build - modules/target/debug/deps - key: cargocache-v2-tests-rust:1.80.0-{{ checksum "modules/Cargo.lock" }} + key: cargocache-v2-tests-rust:1.83.0-{{ checksum "modules/Cargo.lock" }} deploy: docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.83.0 resource_class: large steps: - checkout @@ -409,7 +409,7 @@ jobs: fi - restore_cache: keys: - - cargocache-v2-deploy-rust:1.80.0-{{ checksum "framework/Cargo.lock" }} + - cargocache-v2-deploy-rust:1.83.0-{{ checksum "framework/Cargo.lock" }} - run: name: Decode and Deploy command: | @@ -450,11 +450,11 @@ jobs: - framework/target/debug/.fingerprint - framework/target/debug/build - framework/target/debug/deps - key: cargocache-v2-deploy-rust:1.80.0-{{ checksum "framework/Cargo.lock" }} + key: cargocache-v2-deploy-rust:1.83.0-{{ checksum "framework/Cargo.lock" }} modules-coverage: docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.83.0 resource_class: xlarge steps: - setup_remote_docker @@ -468,7 +468,7 @@ jobs: fi - restore_cache: keys: - - cargocache-v2-coverage-rust:1.80.0-{{ checksum "modules/Cargo.lock" }} + - cargocache-v2-coverage-rust:1.83.0-{{ checksum "modules/Cargo.lock" }} - run: name: Run tests with coverage for modules command: | @@ -481,11 +481,11 @@ jobs: - modules/target/debug/.fingerprint - modules/target/debug/build - modules/target/debug/deps - key: cargocache-v2-deploy-rust:1.80.0-{{ checksum "modules/Cargo.lock" }} + key: cargocache-v2-deploy-rust:1.83.0-{{ checksum "modules/Cargo.lock" }} framework-coverage: docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.83.0 resource_class: xlarge steps: - rust_install_nightly @@ -500,7 +500,7 @@ jobs: fi - restore_cache: keys: - - cargocache-v2-coverage-rust:1.80.0-{{ checksum "framework/Cargo.lock" }} + - cargocache-v2-coverage-rust:1.83.0-{{ checksum "framework/Cargo.lock" }} - run: name: Run tests with coverage for framework command: | @@ -513,7 +513,7 @@ jobs: - framework/target/debug/.fingerprint - framework/target/debug/build - framework/target/debug/deps - key: cargocache-v2-deploy-rust:1.80.0-{{ checksum "framework/Cargo.lock" }} + key: cargocache-v2-deploy-rust:1.83.0-{{ checksum "framework/Cargo.lock" }} pass: docker: diff --git a/framework/workspace-hack/Cargo.toml b/framework/workspace-hack/Cargo.toml index 06a668266..396310cb6 100644 --- a/framework/workspace-hack/Cargo.toml +++ b/framework/workspace-hack/Cargo.toml @@ -35,7 +35,7 @@ memchr = { version = "2" } num-traits = { version = "0.2", default-features = false, features = ["i128", "libm"] } phf_shared = { version = "0.11", default-features = false, features = ["std"] } ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } -prost = { version = "0.13", features = ["prost-derive"] } +prost = { version = "0.13", default-features = false, features = ["prost-derive", "std"] } rand = { version = "0.8", features = ["small_rng"] } rand_chacha = { version = "0.3", default-features = false, features = ["std"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } @@ -47,7 +47,6 @@ serde_json = { version = "1", features = ["alloc"] } sha2 = { version = "0.10", features = ["oid"] } spki = { version = "0.7", default-features = false, features = ["pem", "std"] } subtle-encoding = { version = "0.5", features = ["bech32-preview"] } -tendermint-proto-d585fab2519d2d1 = { package = "tendermint-proto", version = "0.38" } tendermint-proto-f645eb7eb1285ab4 = { package = "tendermint-proto", version = "0.39", features = ["std"] } time = { version = "0.3", default-features = false, features = ["macros", "parsing", "std"] } zeroize = { version = "1", features = ["zeroize_derive"] } @@ -74,7 +73,7 @@ memchr = { version = "2" } num-traits = { version = "0.2", default-features = false, features = ["i128", "libm"] } phf_shared = { version = "0.11", default-features = false, features = ["std"] } ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } -prost = { version = "0.13", features = ["prost-derive"] } +prost = { version = "0.13", default-features = false, features = ["prost-derive", "std"] } rand = { version = "0.8", features = ["small_rng"] } rand_chacha = { version = "0.3", default-features = false, features = ["std"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } @@ -88,7 +87,6 @@ spki = { version = "0.7", default-features = false, features = ["pem", "std"] } subtle-encoding = { version = "0.5", features = ["bech32-preview"] } syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "full", "visit", "visit-mut"] } -tendermint-proto-d585fab2519d2d1 = { package = "tendermint-proto", version = "0.38" } tendermint-proto-f645eb7eb1285ab4 = { package = "tendermint-proto", version = "0.39", features = ["std"] } time = { version = "0.3", default-features = false, features = ["macros", "parsing", "std"] } zeroize = { version = "1", features = ["zeroize_derive"] } @@ -155,6 +153,7 @@ serde_json = { version = "1", default-features = false, features = ["raw_value"] signature = { version = "2", default-features = false, features = ["digest", "rand_core", "std"] } smallvec = { version = "1", default-features = false, features = ["const_new"] } tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint-proto-d585fab2519d2d1 = { package = "tendermint-proto", version = "0.38" } time = { version = "0.3" } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } @@ -229,6 +228,7 @@ signature = { version = "2", default-features = false, features = ["digest", "ra smallvec = { version = "1", default-features = false, features = ["const_new"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", default-features = false, features = ["fold"] } tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint-proto-d585fab2519d2d1 = { package = "tendermint-proto", version = "0.38" } time = { version = "0.3" } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } @@ -300,6 +300,7 @@ serde_json = { version = "1", default-features = false, features = ["raw_value"] signature = { version = "2", default-features = false, features = ["digest", "rand_core", "std"] } smallvec = { version = "1", default-features = false, features = ["const_new"] } tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint-proto-d585fab2519d2d1 = { package = "tendermint-proto", version = "0.38" } time = { version = "0.3" } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } @@ -373,6 +374,7 @@ signature = { version = "2", default-features = false, features = ["digest", "ra smallvec = { version = "1", default-features = false, features = ["const_new"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", default-features = false, features = ["fold"] } tendermint = { version = "0.38", features = ["secp256k1"] } +tendermint-proto-d585fab2519d2d1 = { package = "tendermint-proto", version = "0.38" } time = { version = "0.3" } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io", "time"] } From 10738e36601bfe07380605265fa2abe60c98b79b Mon Sep 17 00:00:00 2001 From: Kayanski Date: Tue, 17 Dec 2024 11:05:05 +0100 Subject: [PATCH 25/25] Format change --- framework/justfile | 2 +- framework/packages/abstract-client/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/justfile b/framework/justfile index 0a477dffb..c4146a9f2 100644 --- a/framework/justfile +++ b/framework/justfile @@ -7,7 +7,7 @@ test: format: cargo fmt --all - find . -type f -iname "*.toml" -print0 | xargs -0 taplo format + taplo format lint: cargo clippy --all --all-features -- -D warnings diff --git a/framework/packages/abstract-client/Cargo.toml b/framework/packages/abstract-client/Cargo.toml index 0af3e22eb..6ce26f7e8 100644 --- a/framework/packages/abstract-client/Cargo.toml +++ b/framework/packages/abstract-client/Cargo.toml @@ -26,8 +26,8 @@ abstract-interface = { workspace = true } abstract-std.workspace = true cosmwasm-std.workspace = true cw-asset = { workspace = true } -cw-orch-interchain = { workspace = true, optional = true } cw-orch.workspace = true +cw-orch-interchain = { workspace = true, optional = true } semver.workspace = true serde.workspace = true thiserror.workspace = true