Merge remote-tracking branch 'origin/main' into fix/circle-ci-2

AbstractSDK · Nov 18, 2024 · b507aa3 · b507aa3
2 parents ae5f055 + 1c8c481
commit b507aa3
Show file tree

Hide file tree

Showing 25 changed files with 125 additions and 42 deletions.
diff --git a/framework/Cargo.lock b/framework/Cargo.lock
diff --git a/framework/Cargo.toml b/framework/Cargo.toml
@@ -132,6 +132,19 @@ incremental = false
 # 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-cw-multi-test = { git = "https://github.com/abstractsdk/cw-multi-test-fork", branch = "feature/add-ics20-transfer-data" }
+# abstract-cw-multi-test = { path = "../../cw-multi-test" }
+cw-orch-interchain-core = { git = "https://github.com/abstractsdk/cw-orchestrator", branch = "interchain/add-ics-hooks-ack" }
+cw-orch-core = { git = "https://github.com/abstractsdk/cw-orchestrator", branch = "interchain/add-ics-hooks-ack" }
+cw-orch-mock = { git = "https://github.com/abstractsdk/cw-orchestrator", branch = "interchain/add-ics-hooks-ack" }
+cw-orch-interchain = { git = "https://github.com/abstractsdk/cw-orchestrator", branch = "interchain/add-ics-hooks-ack" }
+cw-orch-interchain-daemon = { git = "https://github.com/abstractsdk/cw-orchestrator", branch = "interchain/add-ics-hooks-ack" }
+cw-orch-interchain-mock = { git = "https://github.com/abstractsdk/cw-orchestrator", branch = "interchain/add-ics-hooks-ack" }
+# cw-orch-interchain-core = { path = "../../cw-orchestrator/packages/interchain/interchain-core" }
+# cw-orch-core = { path = "../../cw-orchestrator/packages/cw-orch-core" }
+# cw-orch-interchain-daemon = { path = "../../cw-orchestrator/packages/interchain/interchain-daemon" }
+# cw-orch-interchain-mock = { path = "../../cw-orchestrator/packages/interchain/interchain-mock" }
+
 [workspace.metadata.cargo-udeps.ignore]
 # ensures CI doens't flag workspace-hack as unused dep
 normal = ["workspace-hack"]

diff --git a/framework/artifacts/abstract_account-xion.wasm b/framework/artifacts/abstract_account-xion.wasm
diff --git a/framework/artifacts/abstract_account.wasm b/framework/artifacts/abstract_account.wasm
diff --git a/framework/artifacts/abstract_ans_host.wasm b/framework/artifacts/abstract_ans_host.wasm
diff --git a/framework/artifacts/abstract_ibc_client.wasm b/framework/artifacts/abstract_ibc_client.wasm
diff --git a/framework/artifacts/abstract_ibc_host.wasm b/framework/artifacts/abstract_ibc_host.wasm
diff --git a/framework/artifacts/abstract_ica_client.wasm b/framework/artifacts/abstract_ica_client.wasm
diff --git a/framework/artifacts/abstract_module_factory.wasm b/framework/artifacts/abstract_module_factory.wasm
diff --git a/framework/artifacts/abstract_registry.wasm b/framework/artifacts/abstract_registry.wasm
diff --git a/framework/artifacts/checksums.txt b/framework/artifacts/checksums.txt
@@ -1,8 +1,8 @@
-46f96a9b57877d657f2307749b6a4d150a54e92b01792e5ead03549d05bfbddd  abstract_account-xion.wasm
-6ebc59bb33ff7f56558f4858620de20f5317c9ff5faa05561d70ec36c726b572  abstract_account.wasm
-74a263c82e7e86fa005ec61837028d94744edc5aa9b82fc4158f6c1c8e3a05fb  abstract_ans_host.wasm
-cba47eeef944c280896ffa476c2b0691c887d42b783ab737913fec6789c4e0c5  abstract_ibc_client.wasm
-86b17814e6bbbec839393e33a94d874af4983c3509aaa002376322d7a035af8f  abstract_ibc_host.wasm
-7e48c5df669d9df94e992d0d1a71f1ec77296047305a29acb7a12337375aaf70  abstract_ica_client.wasm
-de67580e7ad572ea9826444d37c23a8c01fedd2fd48bfc39a3e4f40ddfe3a4c7  abstract_module_factory.wasm
-6dbf24ac779fa3b607f94a51ded057db762cee51282f0c89b6b0552fa0e2bfa3  abstract_registry.wasm
+b76f606133cc0abd55782483659cfc3f6152b37aa50ea303574db1ab60e9aeb1  abstract_account-xion.wasm
+8eaa27ae3b4e23cb7e60d299ab87f2912814eb9307f12ef39ed20a3946bd9055  abstract_account.wasm
+65fd38ecee0bc49f8720fe9a865a811aabb67375ea5f73a1f12ea2d0d313e6f4  abstract_ans_host.wasm
+1551033a7cc291e5834fc91a17c33848aca75846cd51ec421273e8d1eddbfef0  abstract_ibc_client.wasm
+3ade8af59fbfe549762c256ac2e8dc9f1dccd7967197f70bab074b02d7e1e222  abstract_ibc_host.wasm
+9d88ddf60e590c0b98d389911a3f7e750d38a1586e1d1087a2da1a847b549922  abstract_ica_client.wasm
+8c28d81e792a881356fb4afb82b899ca63de98386a65cb16df3def500309b607  abstract_module_factory.wasm
+143e5a9dc7197b50c8530ba27574b84661c61ce3c9adcb7072e2d8182da92100  abstract_registry.wasm
diff --git a/interchain/Cargo.toml b/interchain/Cargo.toml
@@ -111,6 +111,10 @@ abstract-cw-orch-polytone = { git = "https://github.com/AbstractSDK/polytone.git
 
 # Backup release profile, will result in warnings during optimization
 
+
+abstract-cw-multi-test = { git = "https://github.com/abstractsdk/cw-multi-test-fork", branch = "feature/add-ics20-transfer-data" }
+# abstract-cw-multi-test = { path = "../../cw-multi-test" }
+
 [patch.'https://github.com/AbstractSDK/cw-orchestrator']
 cw-orch = { version = "0.26.0" }
 cw-orch-interchain = { version = "=0.7.2" }

diff --git a/modules/artifacts/abstract_cw_staking-archway.wasm b/modules/artifacts/abstract_cw_staking-archway.wasm
diff --git a/modules/artifacts/abstract_cw_staking.wasm b/modules/artifacts/abstract_cw_staking.wasm
diff --git a/modules/artifacts/abstract_dex_adapter-archway.wasm b/modules/artifacts/abstract_dex_adapter-archway.wasm
diff --git a/modules/artifacts/abstract_dex_adapter.wasm b/modules/artifacts/abstract_dex_adapter.wasm
diff --git a/modules/artifacts/abstract_money_market_adapter.wasm b/modules/artifacts/abstract_money_market_adapter.wasm
diff --git a/modules/artifacts/abstract_subscription.wasm b/modules/artifacts/abstract_subscription.wasm
diff --git a/modules/artifacts/abstract_tendermint_staking_adapter.wasm b/modules/artifacts/abstract_tendermint_staking_adapter.wasm
diff --git a/modules/artifacts/calendar_app.wasm b/modules/artifacts/calendar_app.wasm
diff --git a/modules/artifacts/challenge_app.wasm b/modules/artifacts/challenge_app.wasm
diff --git a/modules/artifacts/checksums.txt b/modules/artifacts/checksums.txt
@@ -1,14 +1,12 @@
-924eee559fbc13f9bc7d504bf0ed0f946cbfc732ac96716759b6c37c50864ecd  abstract_cw_staking-archway.wasm
-d754df23c019a6b6fed08607f0e9c2690dc7d36090dc4cbe89a047a0d13352f2  abstract_cw_staking-osmosis.wasm
-f9016e5b5fa3f1ed2ad62062bc93b05f382762781a1657ac4295cabb4264fffd  abstract_cw_staking.wasm
-d469cb20c316121429ea1d12cf6b5a6db643701969a4341f8046663b10b9f928  abstract_dex_adapter-archway.wasm
-4838ad564cf0588e5bca4c41d10cfeab90f274eb88fad1b0e8016f9dc683830d  abstract_dex_adapter-osmosis.wasm
-e2a68e4f581bc88ffab6810374e12d73752f6f8ae86835aec6c73a68cb82283d  abstract_dex_adapter.wasm
-92f9531247da55e8ae611a1cbe427a05ee9cc0e9817733b40f7d7616a7d452a5  abstract_money_market_adapter.wasm
-8faa62e6a2b0e5c4c665ebbd5287b8535b653e3c13db8a697688b5d309da453e  abstract_subscription.wasm
-d4de8923d17b611a30ab505a1e33fc55d219370d165e1a3a5275773dda852703  abstract_tendermint_staking_adapter.wasm
-67b105ce0fe3550a4a9c1675f583302340d653196b29a813e4957b88d4976687  calendar_app.wasm
-7285eb02a21f36112e5ab19fef9706a341a8801bce6bd18fae0d240f69232ea3  challenge_app.wasm
-bf96d4173a1cef70f7aaf92245729e2454c6ed010c05127e078992bcc7bc4bcb  my_standalone.wasm
-f7b350242ae2c31d3241b9366ed5f785f60c7f88b8b6297279571f85e490381e  payment_app.wasm
-231121e45fd470a8740b6d41fa5d62db879071550e3e71122e47665676235e96  ping_pong.wasm
+56da096c1271911d0d838949fdfdacfae0f0ba875bf485a0a8d3013d182f4e77  abstract_cw_staking-archway.wasm
+00cf5065302112440022efad74e56773ce73bf3866db080ae398ac7ad85876a7  abstract_cw_staking.wasm
+783d3717cd00cb4a8fe622a667c66130b876a08a8c258f95c8b45d57bd880ea7  abstract_dex_adapter-archway.wasm
+956edd146b0bd1b78e5399dcab86c6c65221fd2e7fd622c1e5f61ef07a2728f6  abstract_dex_adapter.wasm
+050372e1e169d2eec3652f1557633bbcb5c1a68d261b1ce8686688b170090e5a  abstract_money_market_adapter.wasm
+80c6bbea754c8e21a34e340f6804e8d9bfe9c86c37902f29d1b6b0cb6f20436d  abstract_subscription.wasm
+fc012653a49f58daa6633ed03ba81291780dbde07d1287ee16711c387f7eb5ec  abstract_tendermint_staking_adapter.wasm
+d1e12306be321c123493803703e37f496300a2d38186dd2c9bc687612cc3eea4  calendar_app.wasm
+c97a8ea7400b5380d6e7e6ebe5e29b1a98c793a16a8ebd2d02fb0d0fe9496542  challenge_app.wasm
+c13c0934d13ac6cea5e30807ee0fc1b7d700f784a46c66978cc650ee7284cd0b  my_standalone.wasm
+a9e4e691c4b8c3efc25049b0bd22336262011b43d2d61be992f659b71f4ca6ae  payment_app.wasm
+82cee32d94c74302bd3720b3bbcef7058517b43a5dbef0cfca92e09d957ac0d6  ping_pong.wasm
diff --git a/modules/artifacts/my_standalone.wasm b/modules/artifacts/my_standalone.wasm
diff --git a/modules/artifacts/payment_app.wasm b/modules/artifacts/payment_app.wasm
diff --git a/modules/artifacts/ping_pong.wasm b/modules/artifacts/ping_pong.wasm