diff --git a/.github/workflows/pr-pytests.yml b/.github/workflows/pr-pytests.yml index 3406cc82..b26ea7ab 100644 --- a/.github/workflows/pr-pytests.yml +++ b/.github/workflows/pr-pytests.yml @@ -6,9 +6,6 @@ on: pull_request: branches: [main] -env: - IROHA_REF: main - jobs: pytest: runs-on: ubuntu-latest @@ -16,30 +13,45 @@ jobs: matrix: python-version: [ 3.12 ] steps: + - name: Maturin build and Run tests + run: sudo apt install -y python pip && \ + pip install maturin && \ + maturin build && \ + cd iroha && scripts/test_env.py setup && cd .. && \ + python -m venv .venv && \ + source .venv/bin/activate && \ + pip install pytest faker allure-pytest && \ + pip install --break-system-packages target/wheels/iroha-*.whl && \ + python -m pytest tests/ - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: pip install poetry - - name: Checkout iroha main repo code - uses: actions/checkout@v4 - with: - repository: 'hyperledger/iroha' - ref: ${{ env.IROHA_REF}} - - name: Run docker-compose.yml containers - run: docker compose -f ./defaults/docker-compose.yml up --wait || exit 1 - name: Checkout code uses: actions/checkout@v4 - - name: Maturin build - run: | - pip install maturin - maturin build - poetry add target/wheels/* - - name: Install project dependencies - run: poetry install - - name: Run tests - run: poetry run pytest tests - - name: Tear down docker containers - if: always() - run: docker stop $(docker ps -q) && docker rm $(docker ps -a -q) + - name: Install dependencies + run: pip install poetry tomli-w + - name: Checkout irohad repo code + run: git clone --depth 1 https://github.com/hyperledger-iroha/iroha.git -b 2.0.0-rc.1 + - name: Install correct rust version + run: rustup install nightly-2024-09-09 && rustup component add rust-src --toolchain nightly-2024-09-09 + - name: Set toolchain + run: rustup default nightly-2024-09-09 + - name: Build irohad + run: cd iroha && cargo build --release && mkdir target/debug -p && cp target/release/irohad target/debug/irohad && cp target/release/iroha target/debug/iroha + - name: Build kagami + run: cd iroha && cargo build --bin kagami + - name: Build default executor + run: cd iroha && cargo run --release --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ./defaults/executor.wasm + - name: Maturin build and Run tests + run: sudo apt install -y python pip && \ + pip install maturin && \ + maturin build && \ + cd iroha && scripts/test_env.py setup && cd .. && \ + python -m venv .venv && \ + source .venv/bin/activate && \ + pip install pytest faker allure-pytest && \ + pip install --break-system-packages target/wheels/iroha-*.whl && \ + python -m pytest tests/ + - name: Tear down the network + run: cd iroha && scripts/test_env.py cleanup diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b3c9e76d..86558653 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -3,6 +3,7 @@ on: pull_request: branches: [main] + jobs: check: runs-on: iroha-ubuntu-latest @@ -37,22 +38,3 @@ jobs: cargo run -p generate -- iroha2/sys yapf --style pep8 -e 'iroha2/sys/**/*.py' -r -i iroha2 example git diff --quiet - - integration-test: - runs-on: iroha-ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build Iroha Python test Docker image - uses: docker/build-push-action@v4 - with: - push: false - dockerfile: example/Dockerfile - repository: iroha - tags: python-test - - name: Run test in docker - working-directory: example - run: | - docker-compose up -d && sleep 5 - docker run --net example_default -v $PWD:/test iroha:python-test \ - timeout 5 python3 test.py || - (docker-compose logs && false) diff --git a/Cargo.lock b/Cargo.lock index c684f751..f6f09048 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" [[package]] name = "arc-swap" @@ -247,7 +247,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -358,7 +358,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", "syn_derive", ] @@ -453,9 +453,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.31" +version = "1.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9" dependencies = [ "shlex", ] @@ -653,7 +653,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -677,7 +677,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -688,7 +688,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -738,7 +738,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -761,7 +761,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -992,7 +992,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -1056,7 +1056,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -1337,7 +1337,7 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -1613,9 +1613,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" [[package]] name = "heck" @@ -1711,6 +1711,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1719,12 +1837,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1762,7 +1891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.1", "serde", ] @@ -1790,7 +1919,7 @@ checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" [[package]] name = "iroha" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "attohttpc", "base64", @@ -1848,7 +1977,7 @@ dependencies = [ [[package]] name = "iroha_config" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "cfg-if", "derive_more", @@ -1875,7 +2004,7 @@ dependencies = [ [[package]] name = "iroha_config_base" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "derive_more", "drop_bomb", @@ -1892,20 +2021,20 @@ dependencies = [ [[package]] name = "iroha_config_base_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "darling", "iroha_macro_utils", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_crypto" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "aead", "arrayref", @@ -1941,7 +2070,7 @@ dependencies = [ [[package]] name = "iroha_data_model" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "base64", "derive_more", @@ -1965,32 +2094,32 @@ dependencies = [ [[package]] name = "iroha_data_model_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "darling", "iroha_macro_utils", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "darling", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_futures" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_config", "iroha_futures_derive", @@ -2006,19 +2135,19 @@ dependencies = [ [[package]] name = "iroha_futures_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_macro_utils", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_logger" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "color-eyre", "derive_more", @@ -2037,7 +2166,7 @@ dependencies = [ [[package]] name = "iroha_macro" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_derive", ] @@ -2045,20 +2174,20 @@ dependencies = [ [[package]] name = "iroha_macro_utils" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "darling", "drop_bomb", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_numeric" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "derive_more", "displaydoc", @@ -2073,7 +2202,7 @@ dependencies = [ [[package]] name = "iroha_primitives" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "derive_more", "displaydoc", @@ -2094,19 +2223,19 @@ dependencies = [ [[package]] name = "iroha_primitives_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_numeric", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_schema" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_schema_derive", "serde", @@ -2115,20 +2244,20 @@ dependencies = [ [[package]] name = "iroha_schema_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "darling", "iroha_macro_utils", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_telemetry" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "async-trait", "chrono", @@ -2153,19 +2282,19 @@ dependencies = [ [[package]] name = "iroha_telemetry_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_macro_utils", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "iroha_torii_const" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_primitives", ] @@ -2173,7 +2302,7 @@ dependencies = [ [[package]] name = "iroha_version" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "iroha_macro", "iroha_version_derive", @@ -2186,13 +2315,13 @@ dependencies = [ [[package]] name = "iroha_version_derive" version = "2.0.0-rc.1.0" -source = "git+https://github.com/hyperledger/iroha.git?rev=c99c41881334b1cbf6bf301f550bd6c3917165e3#c99c41881334b1cbf6bf301f550bd6c3917165e3" +source = "git+https://github.com/hyperledger/iroha.git?branch=2.0.0-rc.1#cba76c34e9839d655897c5e4e0682d98699a7c9c" dependencies = [ "darling", "manyhow", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2292,6 +2421,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "lock_api" version = "0.4.12" @@ -2318,7 +2453,7 @@ dependencies = [ "manyhow-macros", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2585,7 +2720,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2601,29 +2736,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2724,7 +2859,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2836,7 +2971,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2849,7 +2984,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2908,9 +3043,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -3046,9 +3181,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" dependencies = [ "bitflags", "errno", @@ -3200,22 +3335,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3266,7 +3401,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3411,6 +3546,12 @@ dependencies = [ "der", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "stderrlog" version = "0.6.0" @@ -3458,7 +3599,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3480,9 +3621,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.85" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -3498,7 +3639,18 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] @@ -3537,22 +3689,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.65" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" +checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.65" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" +checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3598,6 +3750,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -3638,7 +3800,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3747,7 +3909,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3843,12 +4005,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-bom" version = "2.0.3" @@ -3894,9 +4050,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", "idna", @@ -3910,6 +4066,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "uuid" version = "1.11.0" @@ -3945,9 +4113,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "w3f-bls" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a48c48447120a85b0bdb897ba9426a7aa15b4229498a2e19103e8c9368dd4b2" +checksum = "70a3028804c8bbae2a97a15b71ffc0e308c4b01a520994aafa77d56e94e19024" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -4005,7 +4173,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -4027,7 +4195,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4169,6 +4337,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -4188,6 +4368,30 @@ dependencies = [ "rand_core", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -4206,7 +4410,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", ] [[package]] @@ -4226,5 +4451,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] diff --git a/Cargo.toml b/Cargo.toml index 7189ab88..2c87ad9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,12 +13,12 @@ pyo3 = { version = "0.20.0", features = ["multiple-pymethods", "rust_decimal"] } serde = { version = "1.0.193", features = ["derive"] } serde_json = "1.0.108" -iroha = { git = "https://github.com/hyperledger/iroha.git", rev = "c99c41881334b1cbf6bf301f550bd6c3917165e3" } -iroha_config = { git = "https://github.com/hyperledger/iroha.git", rev = "c99c41881334b1cbf6bf301f550bd6c3917165e3" } -iroha_data_model = { git = "https://github.com/hyperledger/iroha.git", rev = "c99c41881334b1cbf6bf301f550bd6c3917165e3", features = ["transparent_api"] } -iroha_crypto = { git = "https://github.com/hyperledger/iroha.git", rev = "c99c41881334b1cbf6bf301f550bd6c3917165e3" } -iroha_schema = { git = "https://github.com/hyperledger/iroha.git", rev = "c99c41881334b1cbf6bf301f550bd6c3917165e3" } -iroha_primitives = { git = "https://github.com/hyperledger/iroha.git", rev = "c99c41881334b1cbf6bf301f550bd6c3917165e3" } +iroha = { git = "https://github.com/hyperledger/iroha.git", branch = "2.0.0-rc.1" } +iroha_config = { git = "https://github.com/hyperledger/iroha.git", branch = "2.0.0-rc.1" } +iroha_data_model = { git = "https://github.com/hyperledger/iroha.git", branch = "2.0.0-rc.1", features = ["transparent_api"] } +iroha_crypto = { git = "https://github.com/hyperledger/iroha.git", branch = "2.0.0-rc.1" } +iroha_schema = { git = "https://github.com/hyperledger/iroha.git", branch = "2.0.0-rc.1" } +iroha_primitives = { git = "https://github.com/hyperledger/iroha.git", branch = "2.0.0-rc.1" } parity-scale-codec = { version = "3.6.9", default-features = false, features = ["derive"] } paste = "1.0.14" derive_more = "0.99.17"