Skip to content

Commit a0b3438

Browse files
Merge pull request #229 from Chia-Network/update-clvmr
Update clvmr to 0.13.1
2 parents 0747f91 + 7e9459b commit a0b3438

File tree

6 files changed

+38
-26
lines changed

6 files changed

+38
-26
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Build Linux in manylinux_2_28 with maturin on Python ${{ matrix.python }}
6464
if: startsWith(matrix.os, 'ubuntu')
6565
run: |
66-
docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.7.0 build --release --strip --manylinux 2_28 --sdist
66+
docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.8.3 build --release --strip --manylinux 2_28 --sdist
6767
# Refresh in case any ownerships changed.
6868
mv target target.docker && cp -r target.docker target
6969
# Ensure an empty .cargo-lock file exists.

.github/workflows/extensive-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
. ./activate && \
7878
pip install --upgrade pip
7979
'
80-
docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.7.0 build --release --strip --manylinux 2_28
80+
docker run --rm -v $(pwd):/io ghcr.io/pyo3/maturin:v1.8.3 build --release --strip --manylinux 2_28
8181
# Refresh in case any ownerships changed.
8282
mv target target.docker && cp -r target.docker target
8383
# Ensure an empty .cargo-lock file exists.

Cargo.lock

Lines changed: 31 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ do-notation = "0.1.3"
2727
serde_json = "1.0"
2828
sha2 = "0.9.5"
2929
tempfile = "3.19.1"
30-
clvmr = { version = "0.12.0", features = ["pre-eval"] }
30+
clvmr = { version = "0.13.1", features = ["pre-eval"] }
3131
binascii = "0.1.4"
3232
yaml-rust2 = "0.10.1"
3333
hashlink = "0.10.0"
@@ -36,7 +36,7 @@ regex = "1.11.1"
3636
rand = { version = "0.9.0", optional = true }
3737
rand_chacha = { version = "0.9.0", optional = true }
3838
lfsr = { version = "0.3.0", optional = true }
39-
chia-bls = "0.21.2"
39+
chia-bls = "0.22.0"
4040

4141
[dependencies.pyo3]
4242
version = "0.24.1"

src/classic/clvm_tools/stages/stage_0.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
use clvm_rs::allocator::{Allocator, NodePtr};
2-
use clvm_rs::chia_dialect::{
3-
ChiaDialect, ENABLE_KECCAK, ENABLE_KECCAK_OPS_OUTSIDE_GUARD, NO_UNKNOWN_OPS,
4-
};
2+
use clvm_rs::chia_dialect::{ChiaDialect, ENABLE_KECCAK_OPS_OUTSIDE_GUARD, NO_UNKNOWN_OPS};
53
use clvm_rs::core_ops::{op_cons, op_eq, op_first, op_if, op_listp, op_raise, op_rest};
64
use clvm_rs::cost::Cost;
75
use clvm_rs::dialect::{Dialect, OperatorSet};
@@ -202,7 +200,7 @@ impl TRunProgram for DefaultProgramRunner {
202200
),
203201
_ => run_program_with_pre_eval_dialect(
204202
allocator,
205-
&ChiaDialect::new(NO_UNKNOWN_OPS | ENABLE_KECCAK | ENABLE_KECCAK_OPS_OUTSIDE_GUARD),
203+
&ChiaDialect::new(NO_UNKNOWN_OPS | ENABLE_KECCAK_OPS_OUTSIDE_GUARD),
206204
program,
207205
args,
208206
max_cost,

wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ path = "src/mod.rs"
1818

1919
[dependencies]
2020
clvm_tools_rs = { path= "..", features = [] }
21-
clvmr = { version = "0.12.0", features = ["pre-eval"] }
21+
clvmr = { version = "0.13.1", features = ["pre-eval"] }
2222
wasm-bindgen = "=0.2.100"
2323
js-sys = "0.3.60"
2424
num-bigint = "0.4.0"

0 commit comments

Comments
 (0)