ZSA integration (step 8): Merge zsa-issued-assets into zsa-integration-consensus with bug fixes

Cargo.lock

@@ -6034,6 +6034,7 @@ dependencies = [
  "incrementalmerkletree",
  "itertools 0.13.0",
  "jubjub",
+ "k256",
  "lazy_static",
  "nonempty",
  "num-integer",

rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.82.0"
+components = [ "clippy", "rustfmt" ]

zebra-chain/Cargo.toml

@@ -157,6 +157,8 @@ rand_chacha = { version = "0.3.1", optional = true }
 
 zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41", optional = true }
 
+k256 = "0.13.3"
+
 [dev-dependencies]
 # Benchmarks
 criterion = { version = "0.5.1", features = ["html_reports"] }

zebra-chain/src/orchard/commitment.rs

@@ -14,7 +14,7 @@ use halo2::{
 use lazy_static::lazy_static;
 use rand_core::{CryptoRng, RngCore};
 
-use orchard::note::AssetBase;
+use orchard::{note::AssetBase, value::NoteValue};
 
 use crate::{
     amount::Amount,
@@ -255,8 +255,8 @@ impl ValueCommitment {
     /// Generate a new `ValueCommitment` from an existing `rcv on a `value` (ZSA version).
     #[cfg(feature = "tx-v6")]
     #[allow(non_snake_case)]
-    pub fn with_asset(rcv: pallas::Scalar, value: Amount, asset: &AssetBase) -> Self {
-        let v = pallas::Scalar::from(value);
+    pub fn with_asset(rcv: pallas::Scalar, value: NoteValue, asset: &AssetBase) -> Self {
+        let v = pallas::Scalar::from(value.inner());
         let V_zsa = asset.cv_base();
         Self::from(V_zsa * v + *R * rcv)
     }

zebra-chain/src/orchard/orchard_flavor_ext.rs

@@ -15,7 +15,7 @@ use crate::{
 };
 
 #[cfg(feature = "tx-v6")]
-use crate::orchard_zsa::{Burn, NoBurn};
+use crate::orchard_zsa::{Burn, BurnItem, NoBurn};
 
 use super::note;
 
@@ -58,7 +58,9 @@ pub trait OrchardFlavorExt: Clone + Debug {
         + Default
         + ZcashDeserialize
         + ZcashSerialize
+        // FIXME: consider using AsRef instead of Into, to avoid a redundancy
         + Into<ValueCommitment>
+        + AsRef<[BurnItem]>
         + TestArbitrary;
 }
 

zebra-chain/src/orchard_zsa.rs

@@ -9,8 +9,14 @@ pub(crate) mod arbitrary;
 #[cfg(any(test, feature = "proptest-impl"))]
 pub mod tests;
 
+pub mod asset_state;
 mod burn;
 mod issuance;
 
 pub(crate) use burn::{Burn, NoBurn};
 pub(crate) use issuance::IssueData;
+
+pub use burn::BurnItem;
+
+// FIXME: should asset_state mod be pub and these structs be pub as well?
+pub use asset_state::{AssetBase, AssetState, AssetStateChange, IssuedAssets, IssuedAssetsChange};

zebra-chain/src/orchard_zsa/arbitrary.rs

@@ -19,13 +19,9 @@ impl Arbitrary for BurnItem {
         // FIXME: move arb_asset_to_burn out of BundleArb in orchard
         // as it does not depend on flavor (we pinned it here OrchardVanilla
         // just for certainty, as there's no difference, which flavor to use)
-        // FIXME: consider to use BurnItem(asset_base, value.try_into().expect("Invalid value for Amount"))
-        // instead of filtering non-convertable values
         // FIXME: should we filter/protect from including native assets into burn here?
         BundleArb::<orchard::orchard_flavor::OrchardVanilla>::arb_asset_to_burn()
-            .prop_filter_map("Conversion to Amount failed", |(asset_base, value)| {
-                BurnItem::try_from((asset_base, value)).ok()
-            })
+            .prop_map(|(asset_base, value)| BurnItem::from((asset_base, value)))
             .boxed()
     }