Skip to content

fix(interpreter): wrap Resolver closures in Arc::new for upstream API change #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mwaddip wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

fix(interpreter): wrap Resolver closures in Arc::new for upstream API change #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ba8ded
fix(interpreter): adapt to ergo_avltree_rust fork's Arc<dyn Fn> Resol…
mwaddip May 18, 2026
2bcf83e
fix(interpreter): wrap 13th Resolver closure site in create_avl_tree …
mwaddip May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ergotree-interpreter/src/eval/create_avl_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ mod tests {
use super::*;
use crate::eval::test_util::eval_out_wo_ctx;

use alloc::sync::Arc;
use ergo_avltree_rust::authenticated_tree_ops::AuthenticatedTreeOps;
use ergo_avltree_rust::batch_avl_prover::BatchAVLProver;
use ergo_avltree_rust::batch_node::{AVLTree, Node, NodeHeader};
use ergo_avltree_rust::operation::Digest32;
use ergo_chain_types::ADDigest;
use ergotree_ir::mir::{
avl_tree_data::{AvlTreeData, AvlTreeFlags},
Expand All @@ -64,7 +66,7 @@ mod tests {
fn eval_create_avl_tree() {
let prover = BatchAVLProver::new(
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
1,
None,
),
Expand Down
21 changes: 11 additions & 10 deletions ergotree-interpreter/src/eval/savltree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use ergo_avltree_rust::batch_avl_verifier::BatchAVLVerifier;
use ergo_avltree_rust::batch_node::AVLTree;
use ergo_avltree_rust::batch_node::Node;
use ergo_avltree_rust::batch_node::NodeHeader;
use ergo_avltree_rust::operation::Digest32;
use ergo_avltree_rust::operation::KeyValue;
use ergo_avltree_rust::operation::Operation;
use ergo_chain_types::ADDigest;
Expand Down Expand Up @@ -113,7 +114,7 @@ pub(crate) static GET_EVAL_FN: EvalFn = |_mc, _env, _ctx, obj, args| {
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
avl_tree_data.key_length as usize,
avl_tree_data
.value_length_opt
Expand Down Expand Up @@ -161,7 +162,7 @@ pub(crate) static GET_MANY_EVAL_FN: EvalFn =
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
avl_tree_data.key_length as usize,
avl_tree_data
.value_length_opt
Expand Down Expand Up @@ -228,7 +229,7 @@ pub(crate) static INSERT_EVAL_FN: EvalFn =
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
avl_tree_data.key_length as usize,
avl_tree_data
.value_length_opt
Expand Down Expand Up @@ -293,7 +294,7 @@ pub(crate) static REMOVE_EVAL_FN: EvalFn =
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
avl_tree_data.key_length as usize,
avl_tree_data
.value_length_opt
Expand Down Expand Up @@ -349,7 +350,7 @@ pub(crate) static CONTAINS_EVAL_FN: EvalFn = |_mc, _env, _ctx, obj, args| {
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
avl_tree_data.key_length as usize,
avl_tree_data
.value_length_opt
Expand Down Expand Up @@ -397,7 +398,7 @@ pub(crate) static UPDATE_EVAL_FN: EvalFn =
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
avl_tree_data.key_length as usize,
avl_tree_data
.value_length_opt
Expand Down Expand Up @@ -456,7 +457,7 @@ pub(crate) static INSERT_OR_UPDATE_EVAL_FN: EvalFn = |_mc, _env, _ctx, obj, args
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
avl_tree_data.key_length as usize,
avl_tree_data
.value_length_opt
Expand Down Expand Up @@ -666,7 +667,7 @@ mod tests {
// This example taken from `ergo_avltree_rust` README
let mut prover = BatchAVLProver::new(
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
1,
None,
),
Expand Down Expand Up @@ -772,7 +773,7 @@ mod tests {
fn eval_avl_insert_or_update() {
let mut prover = BatchAVLProver::new(
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
1,
None,
),
Expand Down Expand Up @@ -1188,7 +1189,7 @@ mod tests {
fn populate_tree(entries: Vec<(Vec<u8>, Vec<u8>)>) -> BatchAVLProver {
let mut prover = BatchAVLProver::new(
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
1,
None,
),
Expand Down
6 changes: 4 additions & 2 deletions ergotree-interpreter/src/eval/tree_lookup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use alloc::boxed::Box;
use alloc::sync::Arc;
use alloc::vec::Vec;
use bytes::Bytes;
use ergotree_ir::mir::tree_lookup::TreeLookup;
Expand All @@ -10,6 +11,7 @@ use crate::eval::EvalError;
use crate::eval::Evaluable;
use ergo_avltree_rust::batch_avl_verifier::BatchAVLVerifier;
use ergo_avltree_rust::batch_node::{AVLTree, Node, NodeHeader};
use ergo_avltree_rust::operation::Digest32;
use ergo_avltree_rust::operation::Operation;
use ergotree_ir::mir::avl_tree_data::AvlTreeData;
use ergotree_ir::mir::constant::TryExtractInto;
Expand All @@ -35,7 +37,7 @@ impl Evaluable for TreeLookup {
&starting_digest,
&proof,
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
normalized_tree_val.key_length as usize,
normalized_tree_val
.value_length_opt
Expand Down Expand Up @@ -151,7 +153,7 @@ mod tests {
fn populate_tree(entries: Vec<(Vec<u8>, Vec<u8>)>) -> BatchAVLProver {
let mut prover = BatchAVLProver::new(
AVLTree::new(
|digest| Node::LabelOnly(NodeHeader::new(Some(*digest), None)),
Arc::new(|digest: &Digest32| Node::LabelOnly(NodeHeader::new(Some(*digest), None))),
1,
None,
),
Expand Down
Loading