From d96b68fa4c98d758c49b474aad847c85585672a0 Mon Sep 17 00:00:00 2001 From: Sean Chen Date: Tue, 13 Aug 2024 16:19:05 -0500 Subject: [PATCH] Migrate cosmwasm workspace into its own repo. Delete git-filter-repo script Move files out of cosmwasm directory Remove paths from ibc dependencies Updatge rust.yaml Update upload-cw-clients workflow Update rust.yaml msrv Update links in readme Do not gitignore root-level Cargo.lock file Do not exclude ibc-client-tenderint-cw from `make release` --- .github/workflows/rust.yaml | 39 +-- .github/workflows/upload-cw-clients.yaml | 17 +- .gitignore | 7 - cosmwasm/Cargo.lock => Cargo.lock | 236 ++++++++++++------ cosmwasm/Cargo.toml => Cargo.toml | 10 +- cosmwasm/Makefile => Makefile | 6 +- cosmwasm/README.md => README.md | 6 +- .../cw-context/Cargo.toml | 0 .../cw-context/src/api.rs | 0 .../cw-context/src/context/client_ctx.rs | 0 .../cw-context/src/context/custom_ctx.rs | 0 .../cw-context/src/context/mod.rs | 0 .../cw-context/src/handlers.rs | 0 .../cw-context/src/lib.rs | 0 .../cw-context/src/types/error.rs | 0 .../cw-context/src/types/helper.rs | 0 .../cw-context/src/types/mod.rs | 0 .../cw-context/src/types/msgs.rs | 0 .../cw-context/src/types/response.rs | 0 .../cw-context/src/utils/codec.rs | 0 .../cw-context/src/utils/mod.rs | 0 .../ics07-tendermint/Cargo.toml | 0 .../ics07-tendermint/README.md | 0 .../ics07-tendermint/src/client_type.rs | 0 .../ics07-tendermint/src/entrypoint.rs | 0 .../ics07-tendermint/src/lib.rs | 0 .../ics07-tendermint/src/tests/fixture.rs | 0 .../ics07-tendermint/src/tests/helper.rs | 0 .../ics07-tendermint/src/tests/mod.rs | 0 29 files changed, 180 insertions(+), 141 deletions(-) rename cosmwasm/Cargo.lock => Cargo.lock (90%) rename cosmwasm/Cargo.toml => Cargo.toml (64%) rename cosmwasm/Makefile => Makefile (91%) rename cosmwasm/README.md => README.md (78%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/Cargo.toml (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/api.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/context/client_ctx.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/context/custom_ctx.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/context/mod.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/handlers.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/lib.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/types/error.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/types/helper.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/types/mod.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/types/msgs.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/types/response.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/utils/codec.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/cw-context/src/utils/mod.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/Cargo.toml (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/README.md (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/src/client_type.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/src/entrypoint.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/src/lib.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/src/tests/fixture.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/src/tests/helper.rs (100%) rename {cosmwasm/ibc-clients => ibc-clients}/ics07-tendermint/src/tests/mod.rs (100%) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 0aca295..a3cbf23 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -4,19 +4,10 @@ on: paths: - .github/workflows/rust.yaml - Makefile - - '*.toml' + - "*.toml" - ci/** - - cosmwasm/** - - ibc/** - - ibc-core/** - - ibc-apps/** - - ibc-data-types/** - ibc-clients/** - - ibc-primitives/** - - ibc-query/** - - ibc-testkit/** - - ibc-derive/** - - tests-integration/** + push: tags: - v[0-9]+.* @@ -49,25 +40,25 @@ jobs: - name: Install Rust nightly toolchain with rustfmt uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: nightly - components: rustfmt + toolchain: nightly + components: rustfmt - name: Install Rust stable toolchain with clippy uses: actions-rust-lang/setup-rust-toolchain@v1 with: - components: clippy + components: clippy - uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Install Taplo uses: baptiste0928/cargo-install@v3 with: - crate: taplo-cli + crate: taplo-cli - name: Run Lint Checks (fmt, clippy, taplo) run: make lint - name: Spell Check with Typos uses: crate-ci/typos@master with: - config: ./.github/typos.toml + config: ./.github/typos.toml check-docs: name: Check Documentations @@ -81,20 +72,6 @@ jobs: - name: Run cargo docs run: make check-docs - check-features: - name: Check Features - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - uses: actions/checkout@v4 - - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: stable - - name: Install cargo-hack - uses: taiki-e/install-action@cargo-hack - - name: Run cargo hack - run: make check-features - tests: name: Run Tests runs-on: ubuntu-latest @@ -112,7 +89,7 @@ jobs: timeout-minutes: 30 env: CARGO_MSRV_VERSION: 0.16.0-beta.23 - MSRV: 1.72.1 + MSRV: 1.75.0 strategy: matrix: param: diff --git a/.github/workflows/upload-cw-clients.yaml b/.github/workflows/upload-cw-clients.yaml index a3685c8..51433c0 100644 --- a/.github/workflows/upload-cw-clients.yaml +++ b/.github/workflows/upload-cw-clients.yaml @@ -4,27 +4,14 @@ on: paths: - .github/workflows/upload-cw-clients.yaml - Cargo.toml - - cosmwasm/** - - ibc/** - - ibc-core/** - - ibc-apps/** - ibc-clients/** - - ibc-primitives/** - - ibc-testkit/** - - ibc-derive/** + push: branches: main paths: - .github/workflows/upload-cw-clients.yaml - Cargo.toml - - cosmwasm/** - - ibc/** - - ibc-core/** - - ibc-apps/** - ibc-clients/** - - ibc-primitives/** - - ibc-testkit/** - - ibc-derive/** concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -48,7 +35,7 @@ jobs: -v "$(pwd)":/code \ -v "$(pwd)"/target:/target \ -v "${HOME}/.cargo/registry":/usr/local/cargo/registry \ - cosmwasm/optimizer:0.16.0 ./cosmwasm/ibc-clients/ics07-tendermint + cosmwasm/optimizer:0.16.0 ./ibc-clients/ics07-tendermint - name: Fix permissions run: | diff --git a/.gitignore b/.gitignore index 56794f0..ffd881a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,13 +25,6 @@ mc.log # Ignore OSX .DS_Store file .DS_Store -# Only ignore the top-level Cargo.lock. -# Specifically, we want the ci/no-std-check/Cargo.lock to be committed -# to ensure a reproducible CI build for that crate. -# This will make it easier to spot bugs such as [this one](https://github.com/cosmos/ibc-rs/pull/560) -# caused by a dependency updated to a faulty version. -/Cargo.lock - # Ignore CosmWasm artifacts cw-contracts/ diff --git a/cosmwasm/Cargo.lock b/Cargo.lock similarity index 90% rename from cosmwasm/Cargo.lock rename to Cargo.lock index 1a22510..9eb3d81 100644 --- a/cosmwasm/Cargo.lock +++ b/Cargo.lock @@ -193,7 +193,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -204,7 +204,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -411,7 +411,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "syn_derive", ] @@ -438,9 +438,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" [[package]] name = "cfg-if" @@ -468,15 +468,15 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "cosmwasm-core" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367fc87c43759098a476ef90f915aadc66c300480ad9c155b512081fbf327bc1" +checksum = "d905990ef3afb5753bb709dc7de88e9e370aa32bcc2f31731d4b533b63e82490" [[package]] name = "cosmwasm-crypto" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7c41f3e371ea457d3b98bb592c38858b46efcf614e0e988ec2ebbdb973954f" +checksum = "5b2a7bd9c1dd9a377a4dc0f4ad97d24b03c33798cd5a6d7ceb8869b41c5d2f2d" dependencies = [ "ark-bls12-381", "ark-ec", @@ -497,20 +497,20 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10510e8eb66cf7e109741b1e2c76ad18f30b5a1daa064f5f7115c1f733aaea0" +checksum = "029910b409398fdf81955d7301b906caf81f2c42b013ea074fbd89720229c424" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "cosmwasm-schema" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79879b6b7ef6a331b05030ce91ce46a7c4b0baf1ed6b382cce2e9a168109380" +checksum = "4bc0d4d85e83438ab9a0fea9348446f7268bc016aacfebce37e998559f151294" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -521,20 +521,20 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b53e33c0e97170c7ac9cb440f4bc599a07f9cbb9b7e87916cca37b1239d57b" +checksum = "edf5c8adac41bb7751c050d7c4c18675be19ee128714454454575e894424eeef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "cosmwasm-std" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92011c39570876f340d5f9defa68bf92797b1c44421f1b9ea9b04a31d6defd33" +checksum = "51dec99a2e478715c0a4277f0dbeadbb8466500eb7dec873d0924edd086e77f1" dependencies = [ "base64 0.22.1", "bech32", @@ -542,7 +542,7 @@ dependencies = [ "cosmwasm-core", "cosmwasm-crypto", "cosmwasm-derive", - "derive_more 1.0.0-beta.7", + "derive_more 1.0.0", "hex", "rand_core", "schemars", @@ -555,9 +555,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -639,7 +639,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -704,27 +704,27 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "derive_more" -version = "1.0.0-beta.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "1.0.0-beta.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "unicode-xid", ] @@ -757,7 +757,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -854,7 +854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1044,7 +1044,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.3.0", + "indexmap 2.4.0", "slab", "tokio", "tokio-util", @@ -1200,6 +1200,8 @@ dependencies = [ [[package]] name = "ibc" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e95f55d8c5cf080fc3824031e5d8026c96cc0707ffb19cf9db0deda0cd5ea186" dependencies = [ "ibc-apps", "ibc-clients", @@ -1212,6 +1214,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89617c6b9d10039af154e0fa53f9a4a916ba8be1a07b867d138dc562df60228" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -1221,6 +1225,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "708033d0e7ae4c2ba3e5537a614a6f58809dda7bbe720d10d288ade99bc8934e" dependencies = [ "base64 0.22.1", "borsh", @@ -1241,6 +1247,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b227c94f3c5602a7771a8909e8e5403b3f5cdc0144ef229d46ec9f54118cc5a" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1250,6 +1258,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631d60b8c1dbd74ba2609d5a7787ff73925fb4c444fe29ef62dbc7fa9b1bde94" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1267,6 +1277,8 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00955ee844a6fee8e13068432c8d9d9b52fd2471121d73fb0ea9f6865e24a587" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -1286,9 +1298,26 @@ dependencies = [ "serde-json-wasm", ] +[[package]] +name = "ibc-client-cw" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c2a95ee3834e536ce9eea5fa639ec32ad175078e6b9f0b0e2f736c04f4bf769" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus", + "derive_more 0.99.18", + "ibc-client-wasm-types", + "ibc-core", + "prost", +] + [[package]] name = "ibc-client-tendermint" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3699afb0fd43f67b08318e48031c6e7efd40cd9dd2507e17cbc00e188ccef60f" dependencies = [ "derive_more 0.99.18", "ibc-client-tendermint-types", @@ -1307,7 +1336,7 @@ name = "ibc-client-tendermint-cw" version = "0.54.0" dependencies = [ "cosmwasm-std", - "ibc-client-cw", + "ibc-client-cw 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)", "ibc-client-tendermint", "ibc-core", "ibc-testkit", @@ -1319,6 +1348,8 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2bbdc8edd4aa65a02e4255763e2ec11fefcbe019c784373bbba72e2a5cdf1f" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1335,6 +1366,8 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488bee9150aa0600781007ed7d2c5cd957f037c428ba72c40a04e522d66f27b3" dependencies = [ "base64 0.22.1", "displaydoc", @@ -1349,6 +1382,8 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ee36072817816bc71e4e33bdf587ed3a05d0ca7625236653112ef15a7e5ff2" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1357,6 +1392,8 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cddf3c01d56ca1ee49b9ffd8c5e8e6f8c650711fb93c88dcabae4b726f07a43" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1372,6 +1409,8 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e93dd27559decbcc30ea4a7d37870a2d819e0c701ce789d4a99419a289eacc6d" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1386,6 +1425,8 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d0c1d8da6c2f6843d951ec2ccfe0df93f32e96f136870bed90182981648cfb1" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1408,6 +1449,8 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3fdd2d1cbb6b4e003dec33ed8303254341e75bd828d028aa71deddf67f9ec45" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1420,6 +1463,8 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969c1f3411b2ca4e6a041ab8e222937f2cea5a26b26beca45164d05468dc4de4" dependencies = [ "derive_more 0.99.18", "displaydoc", @@ -1435,6 +1480,8 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6799c8383872fd4bf523dceaadd8c884c2748ad1a542e84e93dcbbd667efc59" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1454,6 +1501,8 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6e681fc7336d546f7606670b107e8487fd99867f317c2add7eb79b41060d09" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1472,6 +1521,8 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26abf3cc801896860728d1780c9895994f6ff5ab7bb2af3e5686963c0901654e" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -1485,6 +1536,8 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c07695b8fba97aded7003031480dd25bdb194fdc1f0cca02508f2dcefe10385" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1505,6 +1558,8 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658069f1a43790c6dc1288a980a30e1a1667bf0af53fb3f836d56b7ab7ec728c" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1519,6 +1574,8 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3931e41a6feae1819c59788d2a0a4a08fa51bac3024b63cec4fb88d13882dbee" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1542,6 +1599,8 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "856e37bcabd67cf26934bd127189844b9fc40004fb545b80bef899bef9092df3" dependencies = [ "derive_more 0.99.18", "displaydoc", @@ -1559,6 +1618,8 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34b203c12236140e627270c4d7d469ab2e776a94c22da9051b020303bc6b21f" dependencies = [ "derive_more 0.99.18", "displaydoc", @@ -1581,6 +1642,8 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1b9b6000e8f55cc09e00f7552a7c4acb8c42548ef76088e2154ca839387aba" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1595,6 +1658,8 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "195c93f19d8c9c6e36e518656ca381cd4f86131515ad4e99f7e6d2a1836b7b7e" dependencies = [ "derive_more 0.99.18", "displaydoc", @@ -1608,6 +1673,8 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d27386ce69af9d3e3c63e590cf6e1d466f948c2b3e2b0911872cb6d88adf5b" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1626,15 +1693,19 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0eb1d08a424a2d714652aca4c2738a016c90f4eb78f6f64913f9fe2c77fe34" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "ibc-primitives" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95544f3bc56c8c9cc335910d5aa567a6743a3aeeb33084bb3e31dc6801936edb" dependencies = [ "borsh", "derive_more 0.99.18", @@ -1674,6 +1745,8 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a93a963dcbb97c796c236e6a20367e3db6c3f43c472ead4cde037460a175a48e" dependencies = [ "displaydoc", "ibc", @@ -1684,6 +1757,8 @@ dependencies = [ [[package]] name = "ibc-testkit" version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b84f244a4a3a00892a059707be1ae2e104b79e2073c4aa2faffd7c7074ad55" dependencies = [ "basecoin-store", "derive_more 0.99.18", @@ -1758,9 +1833,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1787,9 +1862,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1872,14 +1947,14 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", "wasi", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1918,9 +1993,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -2027,7 +2102,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2146,10 +2221,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2285,7 +2360,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2345,7 +2420,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2375,9 +2450,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" dependencies = [ "serde_derive", ] @@ -2402,13 +2477,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.207" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2419,14 +2494,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" dependencies = [ "itoa", "memchr", @@ -2442,7 +2517,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2517,7 +2592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2570,9 +2645,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -2588,7 +2663,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2611,15 +2686,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -2713,7 +2788,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2759,7 +2834,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2770,7 +2845,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2809,7 +2884,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "toml_datetime", "winnow", ] @@ -2866,15 +2941,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -2895,7 +2970,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2930,7 +3005,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2993,6 +3068,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -3093,7 +3177,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -3113,5 +3197,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] diff --git a/cosmwasm/Cargo.toml b/Cargo.toml similarity index 64% rename from cosmwasm/Cargo.toml rename to Cargo.toml index 4ba230d..14f694b 100644 --- a/cosmwasm/Cargo.toml +++ b/Cargo.toml @@ -27,11 +27,11 @@ cosmwasm-schema = { version = "2.1.0" } cw-storage-plus = { version = "2.0.0" } # ibc dependencies -ibc-core = { version = "0.54.0", path = "./../ibc-core", default-features = false } -ibc-client-cw = { version = "0.54.0", path = "./ibc-clients/cw-context", default-features = false } -ibc-client-tendermint = { version = "0.54.0", path = "./../ibc-clients/ics07-tendermint", default-features = false } -ibc-client-wasm-types = { version = "0.54.0", path = "./../ibc-clients/ics08-wasm/types", default-features = false } -ibc-testkit = { version = "0.54.0", path = "./../ibc-testkit", default-features = false } +ibc-core = { version = "0.54.0", default-features = false } +ibc-client-cw = { version = "0.54.0", default-features = false } +ibc-client-tendermint = { version = "0.54.0", default-features = false } +ibc-client-wasm-types = { version = "0.54.0", default-features = false } +ibc-testkit = { version = "0.54.0", default-features = false } # cosmos dependencies tendermint = { version = "0.38.0", default-features = false } diff --git a/cosmwasm/Makefile b/Makefile similarity index 91% rename from cosmwasm/Makefile rename to Makefile index da83d71..03cad0f 100644 --- a/cosmwasm/Makefile +++ b/Makefile @@ -23,12 +23,10 @@ test: ## Run tests with all features and without default features. cargo test --all-targets --all-features --no-fail-fast --release check-release: ## Check that the release build compiles. - cargo release --workspace --no-push --no-tag \ - --exclude ibc-client-tendermint-cw + cargo release --workspace --no-push --no-tag release: ## Perform an actual release and publishes to crates.io. - cargo release --workspace --no-push --no-tag --allow-branch HEAD --execute \ - --exclude ibc-client-tendermint-cw + cargo release --workspace --no-push --no-tag --allow-branch HEAD --execute build-tendermint-cw: ## Build the WASM file for the ICS-07 Tendermint light client. @echo "Building the WASM file for the ICS-07 Tendermint light client" diff --git a/cosmwasm/README.md b/README.md similarity index 78% rename from cosmwasm/README.md rename to README.md index bc6c323..7dc1d23 100644 --- a/cosmwasm/README.md +++ b/README.md @@ -24,8 +24,8 @@ contracts. Currently, the available packages are: > [!TIP] > The pre-compiled CosmWasm contract for `ibc-client-tendermint-cw` is available -> as Github workflow artifacts at -> [_Actions_](https://github.com/cosmos/ibc-rs/actions/workflows/upload-cw-clients.yaml) +> as a Github workflow artifact at +> [_Actions_](https://github.com/informalsystems/cosmwasm-ibc/actions/workflows/upload-cw-clients.yaml) > tab. They can be downloaded -> [during a Github workflow](https://github.com/cosmos/ibc-rs/blob/1098f252c04152812f026520e28e323f3bc0507e/.github/workflows/upload-cw-clients.yaml#L87-L96) +> [during a Github workflow](https://github.com/informalsystems/cosmwasm-ibc/blob/d0d137a6a21596b0da73eb77e4acbf0d32d2a79c/.github/workflows/upload-cw-clients.yaml#L65-L72) > using `actions/download-artifact@v4` action. diff --git a/cosmwasm/ibc-clients/cw-context/Cargo.toml b/ibc-clients/cw-context/Cargo.toml similarity index 100% rename from cosmwasm/ibc-clients/cw-context/Cargo.toml rename to ibc-clients/cw-context/Cargo.toml diff --git a/cosmwasm/ibc-clients/cw-context/src/api.rs b/ibc-clients/cw-context/src/api.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/api.rs rename to ibc-clients/cw-context/src/api.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/context/client_ctx.rs b/ibc-clients/cw-context/src/context/client_ctx.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/context/client_ctx.rs rename to ibc-clients/cw-context/src/context/client_ctx.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/context/custom_ctx.rs b/ibc-clients/cw-context/src/context/custom_ctx.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/context/custom_ctx.rs rename to ibc-clients/cw-context/src/context/custom_ctx.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/context/mod.rs b/ibc-clients/cw-context/src/context/mod.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/context/mod.rs rename to ibc-clients/cw-context/src/context/mod.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/handlers.rs b/ibc-clients/cw-context/src/handlers.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/handlers.rs rename to ibc-clients/cw-context/src/handlers.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/lib.rs b/ibc-clients/cw-context/src/lib.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/lib.rs rename to ibc-clients/cw-context/src/lib.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/types/error.rs b/ibc-clients/cw-context/src/types/error.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/types/error.rs rename to ibc-clients/cw-context/src/types/error.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/types/helper.rs b/ibc-clients/cw-context/src/types/helper.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/types/helper.rs rename to ibc-clients/cw-context/src/types/helper.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/types/mod.rs b/ibc-clients/cw-context/src/types/mod.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/types/mod.rs rename to ibc-clients/cw-context/src/types/mod.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/types/msgs.rs b/ibc-clients/cw-context/src/types/msgs.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/types/msgs.rs rename to ibc-clients/cw-context/src/types/msgs.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/types/response.rs b/ibc-clients/cw-context/src/types/response.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/types/response.rs rename to ibc-clients/cw-context/src/types/response.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/utils/codec.rs b/ibc-clients/cw-context/src/utils/codec.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/utils/codec.rs rename to ibc-clients/cw-context/src/utils/codec.rs diff --git a/cosmwasm/ibc-clients/cw-context/src/utils/mod.rs b/ibc-clients/cw-context/src/utils/mod.rs similarity index 100% rename from cosmwasm/ibc-clients/cw-context/src/utils/mod.rs rename to ibc-clients/cw-context/src/utils/mod.rs diff --git a/cosmwasm/ibc-clients/ics07-tendermint/Cargo.toml b/ibc-clients/ics07-tendermint/Cargo.toml similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/Cargo.toml rename to ibc-clients/ics07-tendermint/Cargo.toml diff --git a/cosmwasm/ibc-clients/ics07-tendermint/README.md b/ibc-clients/ics07-tendermint/README.md similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/README.md rename to ibc-clients/ics07-tendermint/README.md diff --git a/cosmwasm/ibc-clients/ics07-tendermint/src/client_type.rs b/ibc-clients/ics07-tendermint/src/client_type.rs similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/src/client_type.rs rename to ibc-clients/ics07-tendermint/src/client_type.rs diff --git a/cosmwasm/ibc-clients/ics07-tendermint/src/entrypoint.rs b/ibc-clients/ics07-tendermint/src/entrypoint.rs similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/src/entrypoint.rs rename to ibc-clients/ics07-tendermint/src/entrypoint.rs diff --git a/cosmwasm/ibc-clients/ics07-tendermint/src/lib.rs b/ibc-clients/ics07-tendermint/src/lib.rs similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/src/lib.rs rename to ibc-clients/ics07-tendermint/src/lib.rs diff --git a/cosmwasm/ibc-clients/ics07-tendermint/src/tests/fixture.rs b/ibc-clients/ics07-tendermint/src/tests/fixture.rs similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/src/tests/fixture.rs rename to ibc-clients/ics07-tendermint/src/tests/fixture.rs diff --git a/cosmwasm/ibc-clients/ics07-tendermint/src/tests/helper.rs b/ibc-clients/ics07-tendermint/src/tests/helper.rs similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/src/tests/helper.rs rename to ibc-clients/ics07-tendermint/src/tests/helper.rs diff --git a/cosmwasm/ibc-clients/ics07-tendermint/src/tests/mod.rs b/ibc-clients/ics07-tendermint/src/tests/mod.rs similarity index 100% rename from cosmwasm/ibc-clients/ics07-tendermint/src/tests/mod.rs rename to ibc-clients/ics07-tendermint/src/tests/mod.rs