Replace chialisp with rue-clvm, bump clvmr to 0.21, release 0.11.0

Cargo.toml

@@ -43,20 +43,21 @@ case_sensitive_file_extension_comparisons = "allow"
 wildcard_imports = "allow"
 
 [workspace.dependencies]
-rue-lexer = { path = "crates/rue-lexer", version = "0.10.0" }
-rue-parser = { path = "crates/rue-parser", version = "0.10.0" }
-rue-diagnostic = { path = "crates/rue-diagnostic", version = "0.10.0" }
-rue-ast = { path = "crates/rue-ast", version = "0.10.0" }
-rue-formatter = { path = "crates/rue-formatter", version = "0.10.0" }
-rue-compiler = { path = "crates/rue-compiler", version = "0.10.0" }
-rue-options = { path = "crates/rue-options", version = "0.10.0" }
-rue-lir = { path = "crates/rue-lir", version = "0.10.0" }
-rue-hir = { path = "crates/rue-hir", version = "0.10.0" }
-rue-types = { path = "crates/rue-types", version = "0.10.0" }
+rue-lexer = { path = "crates/rue-lexer", version = "0.11.0" }
+rue-parser = { path = "crates/rue-parser", version = "0.11.0" }
+rue-diagnostic = { path = "crates/rue-diagnostic", version = "0.11.0" }
+rue-ast = { path = "crates/rue-ast", version = "0.11.0" }
+rue-formatter = { path = "crates/rue-formatter", version = "0.11.0" }
+rue-compiler = { path = "crates/rue-compiler", version = "0.11.0" }
+rue-options = { path = "crates/rue-options", version = "0.11.0" }
+rue-lir = { path = "crates/rue-lir", version = "0.11.0" }
+rue-hir = { path = "crates/rue-hir", version = "0.11.0" }
+rue-types = { path = "crates/rue-types", version = "0.11.0" }
+rue-clvm = { path = "crates/rue-clvm", version = "0.11.0" }
 anyhow = "1.0.98"
-clvm-traits = "0.28.1"
-clvm-utils = "0.28.1"
-clvmr = "0.16.0"
+clvm-traits = "0.51.0"
+clvm-utils = "0.51.0"
+clvmr = "0.21.0"
 derive_more = "2.0.1"
 expect-test = "1.5.1"
 id-arena = "2.2.1"
@@ -86,6 +87,5 @@ tokio = "1.47.1"
 tower-lsp = "0.20.0"
 colored = "3.0.0"
 send_wrapper = "0.6.0"
-chialisp = "0.4.1"
 toml = "0.9.8"
 include_dir = "0.7.4"

crates/rue-ast/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rue-ast"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2024"
 license = "Apache-2.0"
 description = "An implementation of the Abstract Syntax Tree for the Rue compiler."

crates/rue-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rue-cli"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2024"
 license = "Apache-2.0"
 description = "A CLI tool for invoking the Rue compiler."
@@ -26,7 +26,7 @@ rue-diagnostic = { workspace = true }
 rue-lir = { workspace = true }
 clvmr = { workspace = true }
 clvm-utils = { workspace = true }
-chialisp = { workspace = true }
+rue-clvm = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 anyhow = { workspace = true }
 hex = { workspace = true }

crates/rue-cli/src/main.rs

@@ -6,19 +6,19 @@ use std::{
 };
 
 use anyhow::Result;
-use chialisp::classic::clvm_tools::binutils::{assemble, disassemble};
 use clap::Parser;
 use clvm_utils::tree_hash;
 use clvmr::{
-    Allocator, ENABLE_KECCAK_OPS_OUTSIDE_GUARD, MEMPOOL_MODE, NodePtr, SExp,
+    Allocator, NodePtr, SExp,
     error::EvalErr,
     run_program,
     serde::{node_from_bytes, node_to_bytes},
 };
 use colored::Colorize;
+use rue_clvm::{assemble, disassemble_program, disassemble_value};
 use rue_compiler::{Compiler, FileTree, normalize_path};
 use rue_diagnostic::{DiagnosticSeverity, SourceKind};
-use rue_lir::DebugDialect;
+use rue_lir::{CLVM_FLAGS, DebugDialect};
 use rue_options::{Manifest, find_project};
 
 mod fmt;
@@ -371,7 +371,7 @@ fn build(args: BuildArgs) -> Result<()> {
         }
 
         if !args.hex && !args.hash {
-            println!("{}", disassemble(&allocator, program, None));
+            println!("{}", disassemble_program(&allocator, program));
         }
     }
 
@@ -437,7 +437,7 @@ fn test(args: TestArgs) -> Result<()> {
 
         match run_program(
             &mut allocator,
-            &DebugDialect::new(ENABLE_KECCAK_OPS_OUTSIDE_GUARD | MEMPOOL_MODE, true),
+            &DebugDialect::new(CLVM_FLAGS, true),
             test.ptr,
             NodePtr::NIL,
             u64::MAX,
@@ -458,7 +458,7 @@ fn test(args: TestArgs) -> Result<()> {
                             "{}",
                             format!(
                                 "Test failed due to raise: {}",
-                                disassemble(&allocator, error, None)
+                                disassemble_value(&allocator, error)
                             )
                             .red()
                             .bold()
@@ -506,14 +506,14 @@ fn debug(args: DebugArgs) -> Result<()> {
 
     let output = run_program(
         &mut allocator,
-        &DebugDialect::new(ENABLE_KECCAK_OPS_OUTSIDE_GUARD | MEMPOOL_MODE, true),
+        &DebugDialect::new(CLVM_FLAGS, true),
         program,
         solution,
         u64::MAX,
     )?
     .1;
 
-    let output = disassemble(&allocator, output, None);
+    let output = disassemble_value(&allocator, output);
 
     println!("{output}");
 

crates/rue-clvm/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "rue-clvm"
+version = "0.11.0"
+edition = "2024"
+license = "Apache-2.0"
+description = "Converts CLVM values to and from their textual representation."
+authors = ["Brandon Haggstrom <me@rigidnetwork.com>"]
+homepage = "https://github.com/xch-dev/rue"
+repository = "https://github.com/xch-dev/rue"
+readme = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
+
+[lints]
+workspace = true
+
+[dependencies]
+clvmr = { workspace = true }
+num-bigint = { workspace = true }
+hex = { workspace = true }
+thiserror = { workspace = true }