Merge pull request #777 from ergoplatform/executefromvar

ExecuteFromVar fixes

Author: sethdusek

bindings/ergo-lib-c-core/src/context_extension.rs

@@ -3,11 +3,11 @@ use crate::{
     util::{const_ptr_as_ref, mut_ptr_as_mut},
     Error,
 };
-use ergo_lib::ergotree_interpreter::sigma_protocol::prover;
+use ergo_lib::ergotree_ir::chain::context_extension;
 
 /// User-defined variables to be put into context
 #[derive(PartialEq, Eq, Debug, Clone)]
-pub struct ContextExtension(pub prover::ContextExtension);
+pub struct ContextExtension(pub context_extension::ContextExtension);
 pub type ContextExtensionPtr = *mut ContextExtension;
 pub type ConstContextExtensionPtr = *const ContextExtension;
 
@@ -17,7 +17,7 @@ pub unsafe fn context_extension_empty(
 ) -> Result<(), Error> {
     let context_extension_out = mut_ptr_as_mut(context_extension_out, "context_extension_out")?;
     *context_extension_out = Box::into_raw(Box::new(ContextExtension(
-        prover::ContextExtension::empty(),
+        context_extension::ContextExtension::empty(),
     )));
     Ok(())
 }

bindings/ergo-lib-wasm/src/context_extension.rs

@@ -10,16 +10,14 @@ use derive_more::{From, Into};
 /// User-defined variables to be put into context
 #[wasm_bindgen]
 #[derive(PartialEq, Eq, Debug, Clone, From, Into)]
-pub struct ContextExtension(
-    ergo_lib::ergotree_interpreter::sigma_protocol::prover::ContextExtension,
-);
+pub struct ContextExtension(ergo_lib::ergotree_ir::chain::context_extension::ContextExtension);
 
 #[wasm_bindgen]
 impl ContextExtension {
     /// Create new ContextExtension instance
     #[wasm_bindgen(constructor)]
     pub fn new() -> Self {
-        Self(ergo_lib::ergotree_interpreter::sigma_protocol::prover::ContextExtension::empty())
+        Self(ergo_lib::ergotree_ir::chain::context_extension::ContextExtension::empty())
     }
 
     /// Set the supplied pair in the ContextExtension
@@ -29,13 +27,11 @@ impl ContextExtension {
 
     /// Returns the number of elements in the collection
     pub fn len(&self) -> usize {
-        let wrapped: ergo_lib::ergotree_interpreter::sigma_protocol::prover::ContextExtension =
-            self.0.clone();
-        wrapped.values.len()
+        self.0.values.len()
     }
     /// get from map or fail if key is missing
     pub fn get(&self, key: u8) -> Result<Constant, JsValue> {
-        let wrapped: ergo_lib::ergotree_interpreter::sigma_protocol::prover::ContextExtension =
+        let wrapped: ergo_lib::ergotree_ir::chain::context_extension::ContextExtension =
             self.0.clone();
         Ok(wrapped
             .values
@@ -47,7 +43,7 @@ impl ContextExtension {
 
     /// Returns all keys in the map
     pub fn keys(&self) -> Vec<u8> {
-        let wrapped: ergo_lib::ergotree_interpreter::sigma_protocol::prover::ContextExtension =
+        let wrapped: ergo_lib::ergotree_ir::chain::context_extension::ContextExtension =
             self.0.clone();
         wrapped.values.keys().cloned().collect()
     }

bindings/ergo-lib-wasm/tests/transaction.rs

@@ -7,6 +7,7 @@ use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
 
+#[allow(dead_code)]
 #[wasm_bindgen_test]
 fn test_random() {
     let sk1 = SecretKey::random_dlog();

ergo-chain-generation/src/chain_generation.rs

@@ -3,6 +3,7 @@
 
 use std::convert::TryFrom;
 
+use ergo_lib::ergotree_ir::chain::context_extension::ContextExtension;
 use ergo_lib::{
     chain::{
         ergo_box::box_builder::ErgoBoxCandidateBuilder,
@@ -12,10 +13,7 @@ use ergo_lib::{
 };
 use ergo_lib::{
     ergo_chain_types::ADDigest,
-    ergotree_interpreter::sigma_protocol::{
-        private_input::DlogProverInput,
-        prover::{ContextExtension, ProofBytes},
-    },
+    ergotree_interpreter::sigma_protocol::{private_input::DlogProverInput, prover::ProofBytes},
 };
 use ergo_lib::{
     ergo_chain_types::{blake2b256_hash, AutolykosSolution, Header, Votes},

ergo-lib/src/chain/json/context_extension.rs

@@ -1,4 +1,4 @@
-use ergotree_interpreter::sigma_protocol::prover::ContextExtension;
+use ergotree_ir::chain::context_extension::ContextExtension;
 use ergotree_ir::{mir::constant::Constant, serialization::SigmaSerializable};
 use indexmap::IndexMap;
 use serde::{ser::SerializeMap, Deserialize, Serialize};

ergo-lib/src/chain/transaction.rs

@@ -9,8 +9,6 @@ pub mod unsigned;
 
 use bounded_vec::BoundedVec;
 use ergo_chain_types::blake2b256_hash;
-use ergotree_interpreter::eval::context::Context;
-pub use ergotree_interpreter::eval::context::TxIoVec;
 use ergotree_interpreter::eval::env::Env;
 use ergotree_interpreter::eval::extract_sigma_boolean;
 use ergotree_interpreter::eval::EvalError;
@@ -20,6 +18,8 @@ use ergotree_interpreter::sigma_protocol::verifier::TestVerifier;
 use ergotree_interpreter::sigma_protocol::verifier::VerificationResult;
 use ergotree_interpreter::sigma_protocol::verifier::Verifier;
 use ergotree_interpreter::sigma_protocol::verifier::VerifierError;
+use ergotree_ir::chain::context::Context;
+pub use ergotree_ir::chain::context::TxIoVec;
 use ergotree_ir::chain::ergo_box::BoxId;
 use ergotree_ir::chain::ergo_box::ErgoBox;
 use ergotree_ir::chain::ergo_box::ErgoBoxCandidate;

ergo-lib/src/chain/transaction/ergo_transaction.rs

@@ -1,8 +1,6 @@
 //! Exposes common properties for signed and unsigned transactions
-use ergotree_interpreter::sigma_protocol::{
-    prover::ContextExtension,
-    verifier::{VerificationResult, VerifierError},
-};
+use ergotree_interpreter::sigma_protocol::verifier::{VerificationResult, VerifierError};
+use ergotree_ir::chain::context_extension::ContextExtension;
 use ergotree_ir::{
     chain::{
         ergo_box::{box_value::BoxValue, BoxId, ErgoBox},

ergo-lib/src/chain/transaction/input.rs

@@ -2,8 +2,8 @@
 
 pub mod prover_result;
 
-use ergotree_interpreter::sigma_protocol::prover::ContextExtension;
 use ergotree_interpreter::sigma_protocol::prover::ProofBytes;
+use ergotree_ir::chain::context_extension::ContextExtension;
 use ergotree_ir::chain::ergo_box::BoxId;
 use ergotree_ir::serialization::sigma_byte_reader::SigmaByteRead;
 use ergotree_ir::serialization::sigma_byte_writer::SigmaByteWrite;

ergo-lib/src/chain/transaction/input/prover_result.rs

@@ -1,7 +1,7 @@
 //! Proof generated by the prover in Sigma protocol
 
-use ergotree_interpreter::sigma_protocol::prover::ContextExtension;
 use ergotree_interpreter::sigma_protocol::prover::ProofBytes;
+use ergotree_ir::chain::context_extension::ContextExtension;
 use ergotree_ir::serialization::sigma_byte_reader::SigmaByteRead;
 use ergotree_ir::serialization::sigma_byte_writer::SigmaByteWrite;
 use ergotree_ir::serialization::SigmaParsingError;

ergo-lib/src/chain/transaction/input/prover_result/json.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
 use crate::chain::json::context_extension::ContextExtensionSerde;
-use ergotree_interpreter::sigma_protocol::prover::ContextExtension;
+use ergotree_ir::chain::context_extension::ContextExtension;
 use serde::ser::SerializeStruct;
 use serde::Serialize;