Merge up

.github/workflows/build-arm64-wheels.yml

@@ -42,7 +42,7 @@ jobs:
         /opt/python/cp38-cp38/bin/python -m venv venv
         if [ ! -f "activate" ]; then ln -s venv/bin/activate; fi
         . ./activate
-        pip install maturin==1.1.0
+        pip install maturin==1.7.0
         CC=gcc maturin build --release --strip --manylinux 2_28
     - name: Upload artifacts
       uses: actions/upload-artifact@v3

.github/workflows/build-m1-wheel.yml

@@ -52,7 +52,7 @@ jobs:
         python3 -m venv venv
         . ./venv/bin/activate
         export PATH=~/.cargo/bin:$PATH
-        pip install maturin==1.1.0
+        pip install maturin==1.7.0
         maturin build -i python --release --strip
         cargo test
 

.github/workflows/build-test.yml

@@ -51,7 +51,7 @@ jobs:
     - name: Install dependencies
       run: |
           python -m pip install --upgrade pip
-          python -m pip install maturin==1.1.0
+          python -m pip install maturin==1.7.0
 
     - name: Build MacOs with maturin on Python ${{ matrix.python }}
       if: startsWith(matrix.os, 'macos')

.gitignore

@@ -11,3 +11,5 @@ resources/tests/game-referee/*.sym
 resources/tests/game-referee/*.clvm.hex
 __pycache__
 .pytest_cache
+main.sym
+venv/

Cargo.toml

@@ -31,7 +31,7 @@ do-notation = "0.1.3"
 serde_json = "1.0"
 sha2 = "0.9.5"
 tempfile = "3.3.0"
-clvmr = { version = "=0.3.3", features = ["pre-eval"] }
+clvmr = { version = "0.8.0", features = ["pre-eval"] }
 binascii = "0.1.4"
 yaml-rust = "0.4"
 linked-hash-map = "0.5.6"

src/classic/clvm/casts.rs

@@ -1,6 +1,6 @@
+use clvm_rs::NodePtr;
 use num_bigint::ToBigInt;
 
-use clvm_rs::allocator::Allocator;
 use clvm_rs::reduction::EvalErr;
 
 use crate::classic::clvm::__type_compatibility__::{
@@ -12,16 +12,12 @@ pub struct TConvertOption {
     pub signed: bool,
 }
 
-pub fn int_from_bytes(
-    allocator: &Allocator,
-    b: Bytes,
-    option: Option<TConvertOption>,
-) -> Result<u64, EvalErr> {
+pub fn int_from_bytes(b: Bytes, option: Option<TConvertOption>) -> Result<u64, EvalErr> {
     if b.length() == 0 {
         return Ok(0);
     } else if b.length() * 8 > 64 {
         return Err(EvalErr(
-            allocator.null(),
+            NodePtr::NIL,
             "Cannot convert Bytes to Integer larger than 64bit. Use bigint_from_bytes instead."
                 .to_string(),
         ));