btc: Address field accessors

Author: loop-ghost5rty

src/parser/grammar.lalrpop

@@ -170,7 +170,7 @@ ArrayCurly: Expr = "{" <e1:Expr> "," <e2:Expr> "}" =>
 
 // Array/Field child access
 ChildAccess = { ArrayAccess, FieldAccess }; // left-associative recursion
-ChildAccessLHS = { Ident, SimpleCall, BlockExpr, Bytes, ChildAccess }; // would be nice to have: Array, Paren<Expr>
+ChildAccessLHS = { ChildAccess, Ident, SimpleCall, BlockExpr, Address, PubKey, SecKey }; // would be nice to have: Array, Paren<Expr>
 
 // Array element access - `$arr.3`, `$arr.$n`, `$arr.($n+1)`, `$arr.{$n+1}`
 ArrayAccess_: Expr = <array:ChildAccessLHS> "." <index:ArrayAccessRHS> =>

src/runtime/mod.rs

@@ -246,18 +246,6 @@ impl Evaluate for ast::FieldAccess {
 pub trait FieldAccess {
     fn get_field(self, field: &Value) -> Option<Value>;
 }
-impl FieldAccess for Value {
-    fn get_field(self, field: &Value) -> Option<Value> {
-        match self {
-            Value::Array(x) => x.get_field(field),
-            Value::Psbt(x) => x.get_field(field),
-            Value::Transaction(x) => x.get_field(field),
-            Value::Descriptor(x) => x.get_field(field),
-            Value::TapInfo(x) => x.get_field(field),
-            _ => None,
-        }
-    }
-}
 
 impl Evaluate for ast::FnExpr {
     fn eval(&self, scope: &ScopeRef) -> Result<Value> {

src/runtime/value.rs

@@ -11,7 +11,7 @@ use bitcoin::{
 use descriptor::{DescriptorPublicKey, DescriptorSecretKey};
 
 use crate::parser::Expr;
-use crate::runtime::{Array, Error, Evaluate, Function, Result, Scope};
+use crate::runtime::{Array, Error, Evaluate, FieldAccess, Function, Result, Scope};
 use crate::util::{fmt_quoted_str, PrettyDisplay, EC};
 use crate::{error, stdlib, DescriptorDpk as Descriptor, PolicyDpk as Policy};
 use stdlib::btc::WshScript;
@@ -112,7 +112,6 @@ impl_simple_into_variant!(Function, Function, into_fn, NotFn);
 impl_simple_into_variant!(String, String, into_string, NotString);
 impl_simple_into_variant!(WshScript, WshScript, into_wsh_script, NotWshScript);
 
-
 // From Value to f64 primitive, with auto-coercion for integers
 impl TryFrom<Value> for f64 {
     type Error = Error;
@@ -513,6 +512,20 @@ impl ExprRepr for Value {
     }
 }
 
+impl FieldAccess for Value {
+    fn get_field(self, field: &Value) -> Option<Value> {
+        match self {
+            Value::Array(x) => x.get_field(field),
+            Value::Psbt(x) => x.get_field(field),
+            Value::Transaction(x) => x.get_field(field),
+            Value::Descriptor(x) => x.get_field(field),
+            Value::TapInfo(x) => x.get_field(field),
+            Value::Address(x) => x.get_field(field),
+            _ => None,
+        }
+    }
+}
+
 // Symbol
 //
 // A Value type guaranteed to be unique. Symbols don't have any special meaning on the Rust side, but are used in

src/stdlib/btc.rs

@@ -475,6 +475,10 @@ impl_simple_to_value!(Sequence, seq, seq.to_consensus_u32());
 impl_simple_to_value!(AbsLockTime, time, time.to_consensus_u32());
 impl_simple_to_value!(OutPoint, outpoint, (outpoint.txid, outpoint.vout));
 impl_simple_to_value!(Witness, wit, wit.to_vec());
+impl_simple_to_value!(bitcoin::WitnessVersion, ver, ver.to_num() as i64);
+impl_simple_to_value!(bitcoin::AddressType, t, t.to_string());
+impl_simple_to_value!(bitcoin::WitnessProgram, w, (w.version(), w.program()));
+impl_simple_to_value!(&bitcoin::script::PushBytes, p, p.as_bytes().to_vec());
 impl_simple_to_value!(SignedAmount, amt, amt.to_sat());
 // Panics for out-of-range `Amount`s (i64 can represent up to ~92 billion BTC, ~4400x more than can exists),
 // which should be impossible to construct within Minsc (but can be passed from Rust code).
@@ -513,7 +517,8 @@ impl_simple_to_value!(
     i64::try_from(w.to_wu()).expect("out of range weight")
 );
 
-// Transaction fields accessors
+// Field accessors
+
 impl FieldAccess for Transaction {
     fn get_field(self, field: &Value) -> Option<Value> {
         Some(match field.as_str()? {
@@ -533,6 +538,20 @@ impl FieldAccess for Transaction {
     }
 }
 
+impl FieldAccess for Address {
+    fn get_field(self, field: &Value) -> Option<Value> {
+        Some(match field.as_str()? {
+            "script_pubkey" => self.script_pubkey().into(),
+            "address_type" => self.address_type()?.into(),
+            "witness_program" => self.witness_program()?.into(),
+            "qr_uri" => self.to_qr_uri().into(),
+            _ => {
+                return None;
+            }
+        })
+    }
+}
+
 // Display
 
 impl PrettyDisplay for ScriptBuf {