From 88bc8fb83526477bd0788c4257452f10af1ef2e8 Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Thu, 17 Oct 2024 12:07:34 -0700 Subject: [PATCH 01/34] Set MACOSX_DEPLOYMENT_TARGET for Apple Silicon builds --- .github/workflows/build-m1-wheel.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 86fc755b..c964c8f2 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -48,6 +48,8 @@ jobs: rm rustup-init checksum.txt - name: Build m1 wheels + env: + MACOSX_DEPLOYMENT_TARGET: '13.0' run: | python3 -m venv venv . ./venv/bin/activate From 3510812a3ed2e6bdde210c5a3602c755eca1a18e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:59:04 +0000 Subject: [PATCH 02/34] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-arm64-wheels.yml | 2 +- .github/workflows/build-crate.yml | 2 +- .github/workflows/build-m1-wheel.yml | 2 +- .github/workflows/build-riscv.yml | 2 +- .github/workflows/build-test.yml | 2 +- .github/workflows/npm-publish.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-arm64-wheels.yml b/.github/workflows/build-arm64-wheels.yml index 93f65b3c..78e65cd4 100644 --- a/.github/workflows/build-arm64-wheels.yml +++ b/.github/workflows/build-arm64-wheels.yml @@ -45,7 +45,7 @@ jobs: pip install maturin==1.7.0 CC=gcc maturin build --release --strip --manylinux 2_28 - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: target/wheels/ diff --git a/.github/workflows/build-crate.yml b/.github/workflows/build-crate.yml index cdd79aab..77acd2b8 100644 --- a/.github/workflows/build-crate.yml +++ b/.github/workflows/build-crate.yml @@ -53,7 +53,7 @@ jobs: run: cargo publish --dry-run - name: Upload crate artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: crate path: ./target/package/clvm_tools_rs-*.crate diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 86fc755b..a3e05e48 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -106,7 +106,7 @@ jobs: pytest - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: ./target/wheels diff --git a/.github/workflows/build-riscv.yml b/.github/workflows/build-riscv.yml index f46c8b81..62f3ab83 100644 --- a/.github/workflows/build-riscv.yml +++ b/.github/workflows/build-riscv.yml @@ -76,7 +76,7 @@ jobs: ' - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: packages path: ./target/wheels/ diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9ee91c09..e3bc55a5 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -224,7 +224,7 @@ jobs: docker run -v ${GITHUB_WORKSPACE}:/root/clvm_tools_rs -t clvm-tools-rs-alpine sh /root/build-alpine.sh - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: ./target/wheels/ diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 46a2d9fe..4279cdd1 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -62,7 +62,7 @@ jobs: cd wasm/tests/clvm-tools-interface && npm install && yarn test - name: Upload npm pkg artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: npm-pkg path: ./wasm/pkg/clvm_tools_wasm-*.tgz From db6fe75c12d136e21bc91ec39bac6c4627cc8b2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:47:28 +0000 Subject: [PATCH 03/34] Bump actions/setup-node from 3 to 4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/npm-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 46a2d9fe..349fdcca 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -43,7 +43,7 @@ jobs: run: wasm-pack build --release --target=nodejs wasm && wasm-pack pack wasm - name: Setup Node 16.x - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '16.x' From 15378ce32d2cef7bf654a1c78da6e1a582a793b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:49:20 +0000 Subject: [PATCH 04/34] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/audit-check.yml | 2 +- .github/workflows/build-arm64-wheels.yml | 2 +- .github/workflows/build-crate.yml | 2 +- .github/workflows/build-m1-wheel.yml | 4 ++-- .github/workflows/build-riscv.yml | 4 ++-- .github/workflows/build-test.yml | 12 ++++++------ .github/workflows/extensive-tests.yml | 2 +- .github/workflows/npm-publish.yml | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/audit-check.yml b/.github/workflows/audit-check.yml index f27072df..753e64d3 100644 --- a/.github/workflows/audit-check.yml +++ b/.github/workflows/audit-check.yml @@ -8,7 +8,7 @@ jobs: security_audit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/audit-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-arm64-wheels.yml b/.github/workflows/build-arm64-wheels.yml index 93f65b3c..086590aa 100644 --- a/.github/workflows/build-arm64-wheels.yml +++ b/.github/workflows/build-arm64-wheels.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/build-crate.yml b/.github/workflows/build-crate.yml index cdd79aab..4291b303 100644 --- a/.github/workflows/build-crate.yml +++ b/.github/workflows/build-crate.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 86fc755b..da8d0ff0 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -30,7 +30,7 @@ jobs: - uses: Chia-Network/actions/clean-workspace@main - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -117,7 +117,7 @@ jobs: needs: build_wheels steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/build-riscv.yml b/.github/workflows/build-riscv.yml index f46c8b81..ff14588c 100644 --- a/.github/workflows/build-riscv.yml +++ b/.github/workflows/build-riscv.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -51,7 +51,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9ee91c09..0f2ec6cd 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -27,7 +27,7 @@ jobs: python: [3.9, '3.10', 3.11] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -235,7 +235,7 @@ jobs: needs: build_wheels steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -310,7 +310,7 @@ jobs: runs-on: ubuntu-20.04 name: cargo fmt steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 1 - name: Install rust @@ -325,7 +325,7 @@ jobs: clippy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -342,7 +342,7 @@ jobs: runs-on: ubuntu-20.04 name: Unit tests steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 1 - name: Install rust @@ -356,7 +356,7 @@ jobs: coverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable diff --git a/.github/workflows/extensive-tests.yml b/.github/workflows/extensive-tests.yml index 603d2618..7b02ec6e 100644 --- a/.github/workflows/extensive-tests.yml +++ b/.github/workflows/extensive-tests.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 46a2d9fe..b575ad73 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 From 1c5b9bf2763685f0fd270f1fcbeb525bd6d57a41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:50:04 +0000 Subject: [PATCH 05/34] Bump aws-actions/configure-aws-credentials from 2 to 4 Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 2 to 4. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/v2...v4) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-arm64-wheels.yml | 2 +- .github/workflows/build-m1-wheel.yml | 2 +- .github/workflows/build-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-arm64-wheels.yml b/.github/workflows/build-arm64-wheels.yml index 93f65b3c..2cdd6930 100644 --- a/.github/workflows/build-arm64-wheels.yml +++ b/.github/workflows/build-arm64-wheels.yml @@ -106,7 +106,7 @@ jobs: - name: Configure AWS credentials if: steps.check_secrets.outputs.HAS_AWS_SECRET - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: arn:aws:iam::${{ secrets.CHIA_AWS_ACCOUNT_ID }}:role/installer-upload aws-region: us-west-2 diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 86fc755b..7a7d3358 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -165,7 +165,7 @@ jobs: - name: Configure AWS credentials if: steps.check_secrets.outputs.HAS_AWS_SECRET - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: arn:aws:iam::${{ secrets.CHIA_AWS_ACCOUNT_ID }}:role/installer-upload aws-region: us-west-2 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9ee91c09..83861f9e 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -290,7 +290,7 @@ jobs: - name: Configure AWS credentials if: steps.check_secrets.outputs.HAS_AWS_SECRET - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: arn:aws:iam::${{ secrets.CHIA_AWS_ACCOUNT_ID }}:role/installer-upload aws-region: us-west-2 From 85ab3b0d8b0bbc3f2d9aabfebdacb13fb07ad92f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:50:28 +0000 Subject: [PATCH 06/34] Bump docker/setup-qemu-action from 2 to 3 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-riscv.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-riscv.yml b/.github/workflows/build-riscv.yml index f46c8b81..b1fda95b 100644 --- a/.github/workflows/build-riscv.yml +++ b/.github/workflows/build-riscv.yml @@ -29,7 +29,7 @@ jobs: - name: Set up QEMU on x86_64 id: qemu - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: riscv64 @@ -57,7 +57,7 @@ jobs: - name: Set up QEMU on x86_64 id: qemu - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: riscv64 From 0621858125ee81f3cb1af156f94502034d9170eb Mon Sep 17 00:00:00 2001 From: arty Date: Thu, 17 Oct 2024 14:25:32 -0700 Subject: [PATCH 07/34] Update rust-yaml to rust-yaml2 --- Cargo.lock | 44 ++++++++++++++++++++++++---------- Cargo.toml | 4 ++-- src/classic/clvm_tools/cmds.rs | 4 ++-- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a74cdc88..384c41af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,6 +35,12 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "autocfg" version = "1.1.0" @@ -211,12 +217,12 @@ dependencies = [ "do-notation", "encoding8", "getrandom", + "hashlink", "hex", "indoc 1.0.9", "js-sys", "lazy_static", "lfsr", - "linked-hash-map", "num", "num-bigint", "num-traits", @@ -232,7 +238,7 @@ dependencies = [ "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-test", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -394,6 +400,15 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3144e455c7aeda487c72555cac2ef84ccac173b29a57b07382ba27016e57b246" +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -495,6 +510,15 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown", +] + [[package]] name = "heck" version = "0.4.1" @@ -673,12 +697,6 @@ version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.4.3" @@ -1598,12 +1616,14 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3a391fab..69857171 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,8 +33,8 @@ sha2 = "0.9.5" tempfile = "3.3.0" clvmr = { version = "0.8.0", features = ["pre-eval"] } binascii = "0.1.4" -yaml-rust = "0.4" -linked-hash-map = "0.5.6" +yaml-rust2 = "0.9" +hashlink = "0.9.1" serde = { version = "1.0", features = ["derive", "rc"] } regex = "1.8.4" rand = { version = "0.8.5", optional = true } diff --git a/src/classic/clvm_tools/cmds.rs b/src/classic/clvm_tools/cmds.rs index 7607b489..e6a5930a 100644 --- a/src/classic/clvm_tools/cmds.rs +++ b/src/classic/clvm_tools/cmds.rs @@ -14,8 +14,8 @@ use std::time::SystemTime; use core::cmp::max; -use linked_hash_map::LinkedHashMap; -use yaml_rust::{Yaml, YamlEmitter}; +use hashlink::LinkedHashMap; +use yaml_rust2::{Yaml, YamlEmitter}; use clvm_rs::allocator::{Allocator, NodePtr}; use clvm_rs::reduction::EvalErr; From cecfe191abccfa1fc03c9c56368f391eb31a1e44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:34:35 +0000 Subject: [PATCH 08/34] Bump num from 0.4.1 to 0.4.3 Bumps [num](https://github.com/rust-num/num) from 0.4.1 to 0.4.3. - [Changelog](https://github.com/rust-num/num/blob/master/RELEASES.md) - [Commits](https://github.com/rust-num/num/compare/num-0.4.1...num-0.4.3) --- updated-dependencies: - dependency-name: num dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 17 ++++++++--------- Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 384c41af..83fdb495 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,9 +745,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -770,9 +770,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -788,9 +788,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -799,11 +799,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", diff --git a/Cargo.toml b/Cargo.toml index 69857171..eb52934e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ lazy_static = "1.4.0" unicode-segmentation = "1.8.0" derivative = "2.2.0" encoding8 = "0.3.2" -num = "0.4.0" +num = "0.4.3" indoc = "1.0" do-notation = "0.1.3" serde_json = "1.0" From 9a6e66103a0d88896c9c1bda2555f356779791fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:34:44 +0000 Subject: [PATCH 09/34] Bump tempfile from 3.7.0 to 3.13.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.7.0 to 3.13.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.7.0...v3.13.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 112 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 55 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 384c41af..eef97bc9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,9 +73,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -417,30 +417,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -693,15 +682,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -881,7 +870,7 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", "winapi", ] @@ -1081,15 +1070,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" version = "1.10.2" @@ -1131,15 +1111,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1308,15 +1288,15 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.7.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1533,22 +1513,32 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +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.48.1" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -1557,45 +1547,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" diff --git a/Cargo.toml b/Cargo.toml index 69857171..b8c3baed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ indoc = "1.0" do-notation = "0.1.3" serde_json = "1.0" sha2 = "0.9.5" -tempfile = "3.3.0" +tempfile = "3.13.0" clvmr = { version = "0.8.0", features = ["pre-eval"] } binascii = "0.1.4" yaml-rust2 = "0.9" From ffa724b386732efea259d0b75303841cdd2f15b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:34:52 +0000 Subject: [PATCH 10/34] Bump actions/setup-python from 4 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- .github/workflows/extensive-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9ee91c09..ca20eb52 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -36,7 +36,7 @@ jobs: with: toolchain: stable - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 name: Install Python ${{ matrix.python }} with: python-version: ${{ matrix.python }} diff --git a/.github/workflows/extensive-tests.yml b/.github/workflows/extensive-tests.yml index 603d2618..697d3e67 100644 --- a/.github/workflows/extensive-tests.yml +++ b/.github/workflows/extensive-tests.yml @@ -36,7 +36,7 @@ jobs: toolchain: stable components: rustfmt, clippy - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 name: Install Python 3.11 with: python-version: 3.11 From a13490232bae9274aaf622562bad555962334523 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:16:42 +0000 Subject: [PATCH 11/34] Bump regex from 1.10.2 to 1.11.0 Bumps [regex](https://github.com/rust-lang/regex) from 1.10.2 to 1.11.0. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.10.2...1.11.0) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f1c30cc..cc36caeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1071,9 +1071,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -1083,9 +1083,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1094,9 +1094,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rfc6979" diff --git a/Cargo.toml b/Cargo.toml index 9f0e20ce..1934ca2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ binascii = "0.1.4" yaml-rust2 = "0.9" hashlink = "0.9.1" serde = { version = "1.0", features = ["derive", "rc"] } -regex = "1.8.4" +regex = "1.11.0" rand = { version = "0.8.5", optional = true } rand_chacha = { version = "0.3.1", optional = true } lfsr = { version = "0.3.0", optional = true } From 2f5a67657d7d0ddcb662c0cbc2e926d723bd1502 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:16:43 +0000 Subject: [PATCH 12/34] Bump serde_json from 1.0.104 to 1.0.109 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.104 to 1.0.109. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.104...v1.0.109) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f1c30cc..2059b22d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1175,9 +1175,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" dependencies = [ "itoa", "ryu", From e6ce33996632b2d41331a94f7f15dae5d01c89bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:16:44 +0000 Subject: [PATCH 13/34] Bump serde from 1.0.180 to 1.0.193 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.180 to 1.0.193. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.180...v1.0.193) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f1c30cc..1b5faa8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1155,18 +1155,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.180" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.32", From 4aa007fee0ba27b6a98754ab3b47061d3013f61e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:24:27 +0000 Subject: [PATCH 14/34] Bump pyo3 from 0.20.2 to 0.21.2 Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.20.2 to 0.21.2. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyo3/pyo3/compare/v0.20.2...v0.21.2) --- updated-dependencies: - dependency-name: pyo3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 32 ++++++++++++++++++++------------ Cargo.toml | 2 +- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f1c30cc..c3d8d420 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -893,6 +893,12 @@ dependencies = [ "spki", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -938,16 +944,17 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", "indoc 2.0.4", "libc", "memoffset", "parking_lot", - "pyo3-build-config 0.20.2", + "portable-atomic", + "pyo3-build-config 0.21.2", "pyo3-ffi", "pyo3-macros", "unindent", @@ -964,9 +971,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", @@ -974,19 +981,19 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", - "pyo3-build-config 0.20.2", + "pyo3-build-config 0.21.2", ] [[package]] name = "pyo3-macros" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2 1.0.66", "pyo3-macros-backend", @@ -996,12 +1003,13 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ "heck", "proc-macro2 1.0.66", + "pyo3-build-config 0.21.2", "quote 1.0.32", "syn 2.0.32", ] diff --git a/Cargo.toml b/Cargo.toml index 9f0e20ce..00bbd428 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ rand_chacha = { version = "0.3.1", optional = true } lfsr = { version = "0.3.0", optional = true } [dependencies.pyo3] -version = "0.20.2" +version = "0.21.2" features = ["abi3-py38", "extension-module"] optional = true From 42630e7633b8ca597e14fce35475b410e815c5af Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Fri, 18 Oct 2024 08:34:41 -0700 Subject: [PATCH 15/34] Update to new download/upload action --- .github/workflows/build-arm64-wheels.yml | 2 +- .github/workflows/build-m1-wheel.yml | 2 +- .github/workflows/build-test.yml | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-arm64-wheels.yml b/.github/workflows/build-arm64-wheels.yml index 78e65cd4..9ea69390 100644 --- a/.github/workflows/build-arm64-wheels.yml +++ b/.github/workflows/build-arm64-wheels.yml @@ -60,7 +60,7 @@ jobs: needs: build_wheels steps: - name: Fetch wheels from previous job - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: wheels path: target/wheels/ diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index a3e05e48..373773c7 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -132,7 +132,7 @@ jobs: python-version: "3.10" - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: wheels path: ./target/wheels/ diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e3bc55a5..ad75dd59 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -226,7 +226,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.os }}-py-${{ matrix.python }} path: ./target/wheels/ upload: @@ -250,9 +250,10 @@ jobs: python-version: "3.10" - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: wheels + merge-multiple: true + pattern: wheels-* path: ./target/wheels/ - name: Check for incompatible wheels and bail if found From 7eae678c5d9a3d4ba42d0fd0e69f6da33f9ef5df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 17:35:45 +0000 Subject: [PATCH 16/34] Bump pyo3-build-config from 0.15.2 to 0.21.2 Bumps [pyo3-build-config](https://github.com/pyo3/pyo3) from 0.15.2 to 0.21.2. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyo3/pyo3/compare/v0.15.2...v0.21.2) --- updated-dependencies: - dependency-name: pyo3-build-config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 17 ++++------------- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da84abe9..a5e63c3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,7 +227,7 @@ dependencies = [ "num-bigint", "num-traits", "pyo3", - "pyo3-build-config 0.15.2", + "pyo3-build-config", "rand", "rand_chacha", "regex", @@ -954,21 +954,12 @@ dependencies = [ "memoffset", "parking_lot", "portable-atomic", - "pyo3-build-config 0.21.2", + "pyo3-build-config", "pyo3-ffi", "pyo3-macros", "unindent", ] -[[package]] -name = "pyo3-build-config" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" -dependencies = [ - "once_cell", -] - [[package]] name = "pyo3-build-config" version = "0.21.2" @@ -986,7 +977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", - "pyo3-build-config 0.21.2", + "pyo3-build-config", ] [[package]] @@ -1009,7 +1000,7 @@ checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ "heck", "proc-macro2 1.0.66", - "pyo3-build-config 0.21.2", + "pyo3-build-config", "quote 1.0.32", "syn 2.0.32", ] diff --git a/Cargo.toml b/Cargo.toml index bfaae5dc..6376abf2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ getrandom = { version = "0.2", features = ["js"] } getrandom = { version = "0.2" } [build-dependencies] -pyo3-build-config = "0.15.1" +pyo3-build-config = "0.21.2" [[bin]] name = "opd" From 2973610be33b8794e7b50afdc5270dc9cbbb86be Mon Sep 17 00:00:00 2001 From: ChiaAutomation <85647627+ChiaAutomation@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:09:37 -0500 Subject: [PATCH 17/34] Update Managed Files (#151) --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 53a3bbdd..53b8c120 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -21,5 +21,5 @@ jobs: - name: "Dependency Review" uses: actions/dependency-review-action@v4 with: - allow-dependencies-licenses: pkg:pypi/pylint, pkg:pypi/pyinstaller + allow-dependencies-licenses: pkg:pypi/pyinstaller deny-licenses: AGPL-1.0-only, AGPL-1.0-or-later, AGPL-1.0-or-later, AGPL-3.0-or-later, GPL-1.0-only, GPL-1.0-or-later, GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-only, GPL-3.0-or-later From cbdc244c99eb08ac5d5a47992b3048f1260ca6c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 20:29:16 +0000 Subject: [PATCH 18/34] Bump regex from 1.11.0 to 1.11.1 Bumps [regex](https://github.com/rust-lang/regex) from 1.11.0 to 1.11.1. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.11.0...1.11.1) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5e63c3d..6d69792b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1070,9 +1070,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", diff --git a/Cargo.toml b/Cargo.toml index 6376abf2..f6561a97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ binascii = "0.1.4" yaml-rust2 = "0.9" hashlink = "0.9.1" serde = { version = "1.0", features = ["derive", "rc"] } -regex = "1.11.0" +regex = "1.11.1" rand = { version = "0.8.5", optional = true } rand_chacha = { version = "0.3.1", optional = true } lfsr = { version = "0.3.0", optional = true } From 52ed2f772cf9be03b7f4e0d1322d88adfda3de6c Mon Sep 17 00:00:00 2001 From: arty Date: Wed, 13 Nov 2024 11:06:29 -0800 Subject: [PATCH 19/34] Remove derivative as it became unmaintained --- Cargo.lock | 23 ----------------------- Cargo.toml | 1 - src/classic/platform/argparse.rs | 8 +++----- src/lib.rs | 3 --- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d69792b..2f56918c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -213,7 +213,6 @@ dependencies = [ "bls12_381", "bytestream", "clvmr", - "derivative", "do-notation", "encoding8", "getrandom", @@ -316,17 +315,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 1.0.109", -] - [[package]] name = "digest" version = "0.9.0" @@ -1250,17 +1238,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.32" diff --git a/Cargo.toml b/Cargo.toml index f6561a97..c6a2c612 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,6 @@ bytestream = "0.4.1" num-traits = "0.2.14" lazy_static = "1.4.0" unicode-segmentation = "1.8.0" -derivative = "2.2.0" encoding8 = "0.3.2" num = "0.4.3" indoc = "1.0" diff --git a/src/classic/platform/argparse.rs b/src/classic/platform/argparse.rs index b1d4697e..111876bc 100644 --- a/src/classic/platform/argparse.rs +++ b/src/classic/platform/argparse.rs @@ -69,11 +69,9 @@ impl IntConversion { } } -#[derive(Derivative, Clone)] -#[derivative(Debug)] +#[derive(Clone)] pub struct Argument { action: TArgOptionAction, - #[derivative(Debug = "ignore")] typeofarg: Rc, default: Option, help: String, @@ -124,7 +122,7 @@ impl Default for Argument { } } -#[derive(Debug, Clone)] +#[derive(Clone)] pub struct Arg { names: Vec, options: Argument, @@ -141,7 +139,7 @@ pub struct TArgumentParserProps { pub prog: String, } -#[derive(Debug, Clone)] +#[derive(Clone)] pub struct ArgumentParser { prog: String, // desc: String, diff --git a/src/lib.rs b/src/lib.rs index 770c8b8c..aa1959f6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,6 @@ #[macro_use] extern crate lazy_static; -#[macro_use] -extern crate derivative; - #[macro_use] extern crate indoc; From 92324640a39ac0795fbf42258292729dc8642c88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:53:53 +0000 Subject: [PATCH 20/34] Bump unicode-segmentation from 1.10.1 to 1.12.0 Bumps [unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation) from 1.10.1 to 1.12.0. - [Commits](https://github.com/unicode-rs/unicode-segmentation/compare/v1.10.1...v1.12.0) --- updated-dependencies: - dependency-name: unicode-segmentation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f56918c..db0cdbac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1334,9 +1334,9 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-xid" diff --git a/Cargo.toml b/Cargo.toml index c6a2c612..7bb73d1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ bls12_381 = { version = "=0.8.0", features = ["experimental"] } bytestream = "0.4.1" num-traits = "0.2.14" lazy_static = "1.4.0" -unicode-segmentation = "1.8.0" +unicode-segmentation = "1.12.0" encoding8 = "0.3.2" num = "0.4.3" indoc = "1.0" From 1d20c986cd4bc033d12aee3be8022022cd050e9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:06:05 +0000 Subject: [PATCH 21/34] Bump indoc from 1.0.9 to 2.0.4 Bumps [indoc](https://github.com/dtolnay/indoc) from 1.0.9 to 2.0.4. - [Release notes](https://github.com/dtolnay/indoc/releases) - [Commits](https://github.com/dtolnay/indoc/compare/1.0.9...2.0.4) --- updated-dependencies: - dependency-name: indoc dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 ++-------- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db0cdbac..5b85e460 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,7 +218,7 @@ dependencies = [ "getrandom", "hashlink", "hex", - "indoc 1.0.9", + "indoc", "js-sys", "lazy_static", "lfsr", @@ -548,12 +548,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - [[package]] name = "indoc" version = "2.0.4" @@ -937,7 +931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", - "indoc 2.0.4", + "indoc", "libc", "memoffset", "parking_lot", diff --git a/Cargo.toml b/Cargo.toml index 7bb73d1b..7ba22bab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ lazy_static = "1.4.0" unicode-segmentation = "1.12.0" encoding8 = "0.3.2" num = "0.4.3" -indoc = "1.0" +indoc = "2.0" do-notation = "0.1.3" serde_json = "1.0" sha2 = "0.9.5" From 418f3570c9f54a70d01f42f5db53ed9f37756237 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:08:47 +0000 Subject: [PATCH 22/34] Bump getrandom from 0.2.9 to 0.2.15 Bumps [getrandom](https://github.com/rust-random/getrandom) from 0.2.9 to 0.2.15. - [Changelog](https://github.com/rust-random/getrandom/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/getrandom/compare/v0.2.9...v0.2.15) --- updated-dependencies: - dependency-name: getrandom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5b85e460..b5ac1cd4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -449,9 +449,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", From f298864871c7149cc4cb6b839c8ddde07216f3b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:54:29 +0000 Subject: [PATCH 23/34] Bump indoc from 2.0.4 to 2.0.5 Bumps [indoc](https://github.com/dtolnay/indoc) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/dtolnay/indoc/releases) - [Commits](https://github.com/dtolnay/indoc/compare/2.0.4...2.0.5) --- updated-dependencies: - dependency-name: indoc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5ac1cd4..3ef09b2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -550,9 +550,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "instant" From c4cdd9d51ec48856e7219352a8346cb591db67b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 23:42:58 +0000 Subject: [PATCH 24/34] Bump tempfile from 3.13.0 to 3.14.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.13.0 to 3.14.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.13.0...v3.14.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ef09b2a..d014c894 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1091,9 +1091,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -1257,9 +1257,9 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", diff --git a/Cargo.toml b/Cargo.toml index 7ba22bab..7dff82cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ indoc = "2.0" do-notation = "0.1.3" serde_json = "1.0" sha2 = "0.9.5" -tempfile = "3.13.0" +tempfile = "3.14.0" clvmr = { version = "0.8.0", features = ["pre-eval"] } binascii = "0.1.4" yaml-rust2 = "0.9" From 09c5300ac581a413324551a78100b15dd0ff4180 Mon Sep 17 00:00:00 2001 From: arty Date: Tue, 17 Dec 2024 17:33:38 -0800 Subject: [PATCH 25/34] fmt+clippy --- src/classic/clvm/__type_compatibility__.rs | 2 +- src/classic/clvm/serialize.rs | 4 +- src/classic/clvm/sexp.rs | 4 +- .../clvm_tools/stages/stage_2/optimize.rs | 62 +++++++++---------- src/classic/platform/mod.rs | 4 +- src/compiler/evaluate.rs | 2 +- src/compiler/mod.rs | 2 +- src/compiler/sexp.rs | 2 +- src/compiler/stackvisit.rs | 4 +- src/util/mod.rs | 2 +- 10 files changed, 41 insertions(+), 47 deletions(-) diff --git a/src/classic/clvm/__type_compatibility__.rs b/src/classic/clvm/__type_compatibility__.rs index f25696dc..75f481b1 100644 --- a/src/classic/clvm/__type_compatibility__.rs +++ b/src/classic/clvm/__type_compatibility__.rs @@ -22,7 +22,7 @@ pub fn char_to_string(ch: char) -> String { } pub fn vec_to_string(r: &[u8]) -> String { - return String::from_utf8_lossy(r).as_ref().to_string(); + String::from_utf8_lossy(r).as_ref().to_string() } /** diff --git a/src/classic/clvm/serialize.rs b/src/classic/clvm/serialize.rs index a9f57c24..949c1c18 100644 --- a/src/classic/clvm/serialize.rs +++ b/src/classic/clvm/serialize.rs @@ -91,7 +91,7 @@ impl<'a> SExpToBytesIterator<'a> { } } -impl<'a> Iterator for SExpToBytesIterator<'a> { +impl Iterator for SExpToBytesIterator<'_> { type Item = Vec; fn next(&mut self) -> Option { @@ -281,6 +281,6 @@ pub fn atom_from_stream<'a>( if blob.length() != size as usize { return Err(EvalErr(NodePtr::NIL, "bad encoding".to_string())); } - return allocator.new_atom(blob.data()); + allocator.new_atom(blob.data()) }) } diff --git a/src/classic/clvm/sexp.rs b/src/classic/clvm/sexp.rs index 84f69725..5ea82ea4 100644 --- a/src/classic/clvm/sexp.rs +++ b/src/classic/clvm/sexp.rs @@ -202,7 +202,7 @@ pub fn to_sexp_type(allocator: &mut Allocator, value: CastableType) -> Result Err(EvalErr(NodePtr::NIL, "stack empty".to_string())), Some(top) => match top.borrow() { CastableType::CLVMObject(o) => Ok(*o), @@ -211,7 +211,7 @@ pub fn to_sexp_type(allocator: &mut Allocator, value: CastableType) -> Result Bytes { diff --git a/src/classic/clvm_tools/stages/stage_2/optimize.rs b/src/classic/clvm_tools/stages/stage_2/optimize.rs index c7fdce41..4d254d98 100644 --- a/src/classic/clvm_tools/stages/stage_2/optimize.rs +++ b/src/classic/clvm_tools/stages/stage_2/optimize.rs @@ -165,7 +165,7 @@ pub fn cons_q_a_optimizer( let matched = match_sexp(allocator, cons_q_a_optimizer_pattern, r, HashMap::new()); - return match ( + match ( matched.as_ref().and_then(|t1| t1.get("args").copied()), matched.as_ref().and_then(|t1| t1.get("sexp").copied()), ) { @@ -177,7 +177,7 @@ pub fn cons_q_a_optimizer( } } _ => Ok(r), - }; + } } fn cons_pattern(allocator: &mut Allocator) -> NodePtr { @@ -521,41 +521,35 @@ fn path_optimizer( let first_match = match_sexp(allocator, first_atom_pattern, r, HashMap::new()); let rest_match = match_sexp(allocator, rest_atom_pattern, r, HashMap::new()); - return m! { - match (first_match, rest_match) { - (Some(first), _) => { - match first. - get("atom"). - and_then(|a| atom(allocator, *a).ok()). - map(|atom| number_from_u8(&atom)) - { - Some(atom) => { - let node = - NodePath::new(Some(atom)). - add(NodePath::new(None).first()); - allocator.new_atom(node.as_path().data()) - }, - _ => { Ok(r) } + match (first_match, rest_match) { + (Some(first), _) => { + match first + .get("atom") + .and_then(|a| atom(allocator, *a).ok()) + .map(|atom| number_from_u8(&atom)) + { + Some(atom) => { + let node = NodePath::new(Some(atom)).add(NodePath::new(None).first()); + allocator.new_atom(node.as_path().data()) } - }, - (_, Some(rest)) => { - match rest. - get("atom"). - and_then(|a| atom(allocator, *a).ok()). - map(|atom| number_from_u8(&atom)) - { - Some(atom) => { - let node = - NodePath::new(Some(atom)). - add(NodePath::new(None).rest()); - allocator.new_atom(node.as_path().data()) - }, - _ => { Ok(r) } + _ => Ok(r), + } + } + (_, Some(rest)) => { + match rest + .get("atom") + .and_then(|a| atom(allocator, *a).ok()) + .map(|atom| number_from_u8(&atom)) + { + Some(atom) => { + let node = NodePath::new(Some(atom)).add(NodePath::new(None).rest()); + allocator.new_atom(node.as_path().data()) } - }, - _ => Ok(r) + _ => Ok(r), + } } - }; + _ => Ok(r), + } } fn quote_pattern_1(allocator: &mut Allocator) -> NodePtr { diff --git a/src/classic/platform/mod.rs b/src/classic/platform/mod.rs index 72ead7d4..47d3fcf3 100644 --- a/src/classic/platform/mod.rs +++ b/src/classic/platform/mod.rs @@ -11,9 +11,9 @@ impl ArgumentValueConv for PathJoin { fn convert(&self, arg: &str) -> Result { let mut p = PathBuf::new(); p.push(arg); - return Ok(ArgumentValue::ArgString( + Ok(ArgumentValue::ArgString( None, p.as_path().to_str().unwrap().to_string(), - )); + )) } } diff --git a/src/compiler/evaluate.rs b/src/compiler/evaluate.rs index 866bcd07..21c636d5 100644 --- a/src/compiler/evaluate.rs +++ b/src/compiler/evaluate.rs @@ -49,7 +49,7 @@ trait VisitedInfoAccess { fn insert_function(&mut self, name: Vec, body: Rc); } -impl<'info> VisitedInfoAccess for VisitedMarker<'info, VisitedInfo> { +impl VisitedInfoAccess for VisitedMarker<'_, VisitedInfo> { fn get_function(&mut self, name: &[u8]) -> Option> { if let Some(ref mut info) = self.info { info.functions.get(name).cloned() diff --git a/src/compiler/mod.rs b/src/compiler/mod.rs index 0b835139..3920a884 100644 --- a/src/compiler/mod.rs +++ b/src/compiler/mod.rs @@ -267,7 +267,7 @@ impl<'a> CompileContextWrapper<'a> { /// Drop CompileContextWrapper reverts the contained objects back to the ones /// owned by the caller. -impl<'a> Drop for CompileContextWrapper<'a> { +impl Drop for CompileContextWrapper<'_> { fn drop(&mut self) { self.switch(); } diff --git a/src/compiler/sexp.rs b/src/compiler/sexp.rs index eee39c7b..c426b080 100644 --- a/src/compiler/sexp.rs +++ b/src/compiler/sexp.rs @@ -367,7 +367,7 @@ fn list_no_parens(a: &SExp, b: &SExp) -> String { } pub fn decode_string(v: &[u8]) -> String { - return String::from_utf8_lossy(v).as_ref().to_string(); + String::from_utf8_lossy(v).as_ref().to_string() } pub fn printable(a: &[u8], quoted: bool) -> bool { diff --git a/src/compiler/stackvisit.rs b/src/compiler/stackvisit.rs index 32ba9e67..276191cf 100644 --- a/src/compiler/stackvisit.rs +++ b/src/compiler/stackvisit.rs @@ -51,7 +51,7 @@ impl<'info, T> VisitedMarker<'info, T> { } } -impl<'info, T> Unvisit for VisitedMarker<'info, T> { +impl Unvisit for VisitedMarker<'_, T> { fn give_back(&mut self, info: Option>) { self.info = info; } @@ -66,7 +66,7 @@ impl<'info, T> Unvisit for VisitedMarker<'info, T> { } // When dropped, the info box is handed back. -impl<'info, T> Drop for VisitedMarker<'info, T> { +impl Drop for VisitedMarker<'_, T> { fn drop(&mut self) { let mut info = None; swap(&mut self.info, &mut info); diff --git a/src/util/mod.rs b/src/util/mod.rs index d075b9ab..8988c5c6 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -40,7 +40,7 @@ where } pub fn skip_leading(s: &str, dash: &str) -> String { - return s.graphemes(true).skip_while(|ch| dash == *ch).collect(); + s.graphemes(true).skip_while(|ch| dash == *ch).collect() } pub fn collapse(r: Result) -> A { From 29a757374e44e44af106b291669b7b0a7c4d5f59 Mon Sep 17 00:00:00 2001 From: Chia Automation Date: Sat, 21 Dec 2024 16:05:29 +0000 Subject: [PATCH 26/34] Update dependabot --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f7d56e2c..2ba36cb5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -34,7 +34,7 @@ updates: reviewers: ["emlowe", "altendky"] - package-ecosystem: "github-actions" - directory: / + directories: ["/", ".github/actions/*"] schedule: interval: "weekly" day: "tuesday" From 23230e01b75f12dc81189691b98c2b189c271fde Mon Sep 17 00:00:00 2001 From: arty Date: Thu, 2 Jan 2025 01:47:09 -0800 Subject: [PATCH 27/34] Add dynamic version to pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0a55fff3..eceb95d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,7 @@ features = ["extension-module"] [project] name = "clvm_tools_rs" +dynamic = "version" # - Reenable these when we switch over from clvm_tools. # [project.scripts] From 3ca54be57b47309726276d93cf196fab74d4c54d Mon Sep 17 00:00:00 2001 From: arty Date: Thu, 2 Jan 2025 01:49:59 -0800 Subject: [PATCH 28/34] Required to be an array --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index eceb95d5..8660e052 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ features = ["extension-module"] [project] name = "clvm_tools_rs" -dynamic = "version" +dynamic = ["version"] # - Reenable these when we switch over from clvm_tools. # [project.scripts] From 1d60f49c73b95bb5698cbebf2b54f2f41553bbe5 Mon Sep 17 00:00:00 2001 From: ChiaAutomation <85647627+ChiaAutomation@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:35:44 +0000 Subject: [PATCH 29/34] Updated License (#170) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 7e8bb6bb..ef0cf9fb 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2024 Chia Network Inc. + Copyright 2025 Chia Network Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 5854c4f3c7ad11036c5b4494cc592458f46250fe Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Tue, 7 Jan 2025 11:06:15 -0800 Subject: [PATCH 30/34] Update alpine to latest and simplify script --- resources/alpine/Dockerfile | 19 +++++-------------- resources/alpine/build-openssl.sh | 14 -------------- 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100755 resources/alpine/build-openssl.sh diff --git a/resources/alpine/Dockerfile b/resources/alpine/Dockerfile index 4ec66bbe..7654beed 100644 --- a/resources/alpine/Dockerfile +++ b/resources/alpine/Dockerfile @@ -1,19 +1,10 @@ -FROM alpine:3.16.2 +FROM alpine:latest WORKDIR /root -RUN sh -c "echo https://mirrors.edge.kernel.org/alpine/v3.16.2/community >> /etc/apk/repositories" -RUN apk add git curl python3 openssl openssl-dev perl linux-headers make gcc musl-dev patch patchelf +RUN apk add git curl python3 openssl openssl-dev perl linux-headers make gcc musl-dev patch patchelf py3-pip RUN curl --proto '=https' --tlsv1.2 -sSf -o rustup https://sh.rustup.rs RUN sh ./rustup -y -COPY build-openssl.sh . -RUN sh ./build-openssl.sh -RUN curl https://files.pythonhosted.org/packages/b1/77/75f6543eafdffc0b3f07f99682497bea817ef0b6c361fe72b932eb82459c/setuptools-62.2.0.tar.gz | tar xzvf - -COPY wheel.diff setuptools-62.2.0 -RUN cd setuptools-62.2.0 && patch -p1 < wheel.diff -RUN curl https://files.pythonhosted.org/packages/99/bb/696e256f4f445809f25efd4e4ce42ff99664dc089cafa1e097d5fec7fc33/pip-22.1.tar.gz | tar xzvf - -RUN sh -c "cd setuptools-62.2.0 && python3 setup.py install" -RUN curl https://files.pythonhosted.org/packages/99/bb/696e256f4f445809f25efd4e4ce42ff99664dc089cafa1e097d5fec7fc33/pip-22.1.tar.gz | tar xzvf - -RUN sh -c "cd pip-22.1 && python3 setup.py install" -RUN pip install maturin[patchelf] -RUN pip install maturin WORKDIR /root/clvm_tools_rs +RUN python3 -m venv venv +RUN source venv/bin/activate +RUN pip install maturin[patchelf] COPY ./build-alpine.sh /root diff --git a/resources/alpine/build-openssl.sh b/resources/alpine/build-openssl.sh deleted file mode 100755 index 7cff3d61..00000000 --- a/resources/alpine/build-openssl.sh +++ /dev/null @@ -1,14 +0,0 @@ -ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm -ln -s /usr/include/asm-generic /usr/include/x86_64-linux-musl/asm-generic -ln -s /usr/include/linux /usr/include/x86_64-linux-musl/linux - -mkdir /musl - -wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1f.tar.gz -tar zxvf OpenSSL_1_1_1f.tar.gz -cd openssl-OpenSSL_1_1_1f/ - -CC="/usr/bin/x86_64-alpine-linux-musl-gcc -static" ./Configure no-shared no-async --prefix=/musl --openssldir=/musl/ssl linux-x86_64 -make depend -make -j$(nproc) -make install From e728592981defd8aef08fdcc0cc22d89e82a1e5e Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Tue, 7 Jan 2025 11:44:06 -0800 Subject: [PATCH 31/34] proper venv activate for Dockerfile --- resources/alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/alpine/Dockerfile b/resources/alpine/Dockerfile index 7654beed..15d2698e 100644 --- a/resources/alpine/Dockerfile +++ b/resources/alpine/Dockerfile @@ -5,6 +5,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf -o rustup https://sh.rustup.rs RUN sh ./rustup -y WORKDIR /root/clvm_tools_rs RUN python3 -m venv venv -RUN source venv/bin/activate +ENV PATH="/root/clvm_tools_rs/venv/bin:$PATH" RUN pip install maturin[patchelf] COPY ./build-alpine.sh /root From 9ce37b1072dd172f4d0e60ad40083a5623da3f11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:36:33 +0000 Subject: [PATCH 32/34] Bump tempfile from 3.14.0 to 3.15.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.14.0 to 3.15.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.14.0...v3.15.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 5 +++-- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d014c894..f973045a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1257,12 +1257,13 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", "windows-sys 0.59.0", diff --git a/Cargo.toml b/Cargo.toml index 7dff82cd..8c86ad6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ indoc = "2.0" do-notation = "0.1.3" serde_json = "1.0" sha2 = "0.9.5" -tempfile = "3.14.0" +tempfile = "3.15.0" clvmr = { version = "0.8.0", features = ["pre-eval"] } binascii = "0.1.4" yaml-rust2 = "0.9" From 4743570ca539b03f85965e7a4ef9c0711b1bb8a7 Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Tue, 7 Jan 2025 12:39:12 -0800 Subject: [PATCH 33/34] use venv to run maturin --- resources/alpine/build-alpine.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/alpine/build-alpine.sh b/resources/alpine/build-alpine.sh index 4526eb18..4e6d9e47 100755 --- a/resources/alpine/build-alpine.sh +++ b/resources/alpine/build-alpine.sh @@ -2,4 +2,5 @@ . $HOME/.cargo/env cd /root/clvm_tools_rs +source venv/bin/activate CC=gcc maturin build --release --strip --compatibility musllinux_1_1 --target x86_64-unknown-linux-musl From 43569f70207310d31ff2db3089b616f76b81f8a5 Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Tue, 7 Jan 2025 14:06:21 -0800 Subject: [PATCH 34/34] move python venv into script --- resources/alpine/Dockerfile | 3 --- resources/alpine/build-alpine.sh | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/alpine/Dockerfile b/resources/alpine/Dockerfile index 15d2698e..fc8a2530 100644 --- a/resources/alpine/Dockerfile +++ b/resources/alpine/Dockerfile @@ -4,7 +4,4 @@ RUN apk add git curl python3 openssl openssl-dev perl linux-headers make gcc mus RUN curl --proto '=https' --tlsv1.2 -sSf -o rustup https://sh.rustup.rs RUN sh ./rustup -y WORKDIR /root/clvm_tools_rs -RUN python3 -m venv venv -ENV PATH="/root/clvm_tools_rs/venv/bin:$PATH" -RUN pip install maturin[patchelf] COPY ./build-alpine.sh /root diff --git a/resources/alpine/build-alpine.sh b/resources/alpine/build-alpine.sh index 4e6d9e47..947be356 100755 --- a/resources/alpine/build-alpine.sh +++ b/resources/alpine/build-alpine.sh @@ -2,5 +2,7 @@ . $HOME/.cargo/env cd /root/clvm_tools_rs -source venv/bin/activate +python3 -m venv venv +source ./venv/bin/activate +pip install maturin[patchelf] CC=gcc maturin build --release --strip --compatibility musllinux_1_1 --target x86_64-unknown-linux-musl