circuit: Rename asset to token.

src/circuit/mint_contract.rs

@@ -53,19 +53,19 @@ impl MintConfig {
 const MINT_COIN_OFFSET: usize = 0;
 const MINT_VALCOMX_OFFSET: usize = 1;
 const MINT_VALCOMY_OFFSET: usize = 2;
-const MINT_ASSCOMX_OFFSET: usize = 3;
-const MINT_ASSCOMY_OFFSET: usize = 4;
+const MINT_TOKCOMX_OFFSET: usize = 3;
+const MINT_TOKCOMY_OFFSET: usize = 4;
 
 #[derive(Default, Debug)]
 pub struct MintContract {
     pub pub_x: Option<pallas::Base>,         // x coordinate for pubkey
     pub pub_y: Option<pallas::Base>,         // y coordinate for pubkey
     pub value: Option<pallas::Base>,         // The value of this coin
-    pub asset: Option<pallas::Base>,         // The asset ID
+    pub token: Option<pallas::Base>,         // The token ID
     pub serial: Option<pallas::Base>,        // Unique serial number corresponding to this coin
     pub coin_blind: Option<pallas::Base>,    // Random blinding factor for coin
     pub value_blind: Option<pallas::Scalar>, // Random blinding factor for value commitment
-    pub asset_blind: Option<pallas::Scalar>, // Random blinding factor for the asset ID
+    pub token_blind: Option<pallas::Scalar>, // Random blinding factor for the token ID
 }
 
 impl UtilitiesInstructions<pallas::Base> for MintContract {
@@ -223,8 +223,8 @@ impl Circuit<pallas::Base> for MintContract {
         let value =
             self.load_private(layouter.namespace(|| "load value"), config.advices[0], self.value)?;
 
-        let asset =
-            self.load_private(layouter.namespace(|| "load asset"), config.advices[0], self.asset)?;
+        let token =
+            self.load_private(layouter.namespace(|| "load token"), config.advices[0], self.token)?;
 
         let serial = self.load_private(
             layouter.namespace(|| "load serial"),
@@ -242,7 +242,7 @@ impl Circuit<pallas::Base> for MintContract {
         // Coin hash
         // =========
         let coin = {
-            let poseidon_message = [pub_x, pub_y, value, asset, serial, coin_blind];
+            let poseidon_message = [pub_x, pub_y, value, token, serial, coin_blind];
 
             let poseidon_hasher = PoseidonHash::<_, _, P128Pow5T3, _, 3, 2>::init(
                 config.poseidon_chip(),
@@ -302,36 +302,36 @@ impl Circuit<pallas::Base> for MintContract {
         )?;
 
         // ================
-        // Asset commitment
+        // Token commitment
         // ================
         // a * G_1
         let (commitment, _) = {
-            let asset_commit_v = OrchardFixedBases::ValueCommitV;
-            let asset_commit_v = FixedPoint::from_inner(ecc_chip.clone(), asset_commit_v);
-            asset_commit_v.mul_short(layouter.namespace(|| "[asset] ValueCommitV"), (asset, one))?
+            let token_commit_v = OrchardFixedBases::ValueCommitV;
+            let token_commit_v = FixedPoint::from_inner(ecc_chip.clone(), token_commit_v);
+            token_commit_v.mul_short(layouter.namespace(|| "[token] ValueCommitV"), (token, one))?
         };
 
         // r_A * G_2
         let (blind, _rca) = {
-            let rca = self.asset_blind;
-            let asset_commit_r = OrchardFixedBases::ValueCommitR;
-            let asset_commit_r = FixedPoint::from_inner(ecc_chip, asset_commit_r);
-            asset_commit_r.mul(layouter.namespace(|| "[asset_blind] ValueCommitR"), rca)?
+            let rca = self.token_blind;
+            let token_commit_r = OrchardFixedBases::ValueCommitR;
+            let token_commit_r = FixedPoint::from_inner(ecc_chip, token_commit_r);
+            token_commit_r.mul(layouter.namespace(|| "[token_blind] ValueCommitR"), rca)?
         };
 
-        let asset_commit = commitment.add(layouter.namespace(|| "assetcommit"), &blind)?;
+        let token_commit = commitment.add(layouter.namespace(|| "tokencommit"), &blind)?;
 
-        // Constrain the asset commitment coordinates
+        // Constrain the token commitment coordinates
         layouter.constrain_instance(
-            asset_commit.inner().x().cell(),
+            token_commit.inner().x().cell(),
             config.primary,
-            MINT_ASSCOMX_OFFSET,
+            MINT_TOKCOMX_OFFSET,
         )?;
 
         layouter.constrain_instance(
-            asset_commit.inner().y().cell(),
+            token_commit.inner().y().cell(),
             config.primary,
-            MINT_ASSCOMY_OFFSET,
+            MINT_TOKCOMY_OFFSET,
         )?;
 
         // At this point we've enforced all of our public inputs.

src/circuit/spend_contract.rs

@@ -85,8 +85,8 @@ impl SpendConfig {
 const BURN_NULLIFIER_OFFSET: usize = 0;
 const BURN_VALCOMX_OFFSET: usize = 1;
 const BURN_VALCOMY_OFFSET: usize = 2;
-const BURN_ASSCOMX_OFFSET: usize = 3;
-const BURN_ASSCOMY_OFFSET: usize = 4;
+const BURN_TOKCOMX_OFFSET: usize = 3;
+const BURN_TOKCOMY_OFFSET: usize = 4;
 const BURN_MERKLEROOT_OFFSET: usize = 5;
 const BURN_SIGKEYX_OFFSET: usize = 6;
 const BURN_SIGKEYY_OFFSET: usize = 7;
@@ -96,10 +96,10 @@ pub struct SpendContract {
     pub secret_key: Option<pallas::Base>,
     pub serial: Option<pallas::Base>,
     pub value: Option<pallas::Base>,
-    pub asset: Option<pallas::Base>,
+    pub token: Option<pallas::Base>,
     pub coin_blind: Option<pallas::Base>,
     pub value_blind: Option<pallas::Scalar>,
-    pub asset_blind: Option<pallas::Scalar>,
+    pub token_blind: Option<pallas::Scalar>,
     pub leaf_pos: Option<u32>,
     pub merkle_path: Option<[pallas::Base; 32]>,
     //pub sig_secret: Option<pallas::Scalar>,
@@ -306,8 +306,8 @@ impl Circuit<pallas::Base> for SpendContract {
         let value =
             self.load_private(layouter.namespace(|| "load value"), config.advices[0], self.value)?;
 
-        let asset =
-            self.load_private(layouter.namespace(|| "load asset"), config.advices[0], self.asset)?;
+        let token =
+            self.load_private(layouter.namespace(|| "load token"), config.advices[0], self.token)?;
 
         let coin_blind = self.load_private(
             layouter.namespace(|| "load coin_blind"),
@@ -327,7 +327,7 @@ impl Circuit<pallas::Base> for SpendContract {
         // Coin hash
         // =========
         let coin = {
-            let poseidon_message = [pub_x, pub_y, value, asset, serial, coin_blind];
+            let poseidon_message = [pub_x, pub_y, value, token, serial, coin_blind];
 
             let poseidon_hasher = PoseidonHash::<_, _, P128Pow5T3, _, 3, 2>::init(
                 config.poseidon_chip(),
@@ -406,38 +406,40 @@ impl Circuit<pallas::Base> for SpendContract {
         )?;
 
         // ================
-        // Asset commitment
+        // Token commitment
         // ================
 
-        let asset =
-            self.load_private(layouter.namespace(|| "load asset"), config.advices[0], self.asset)?;
+        let token =
+            self.load_private(layouter.namespace(|| "load token"), config.advices[0], self.token)?;
 
         // a * G_1
         let (commitment, _) = {
-            let asset_commit_v = OrchardFixedBases::ValueCommitV;
-            let asset_commit_v = FixedPoint::from_inner(ecc_chip.clone(), asset_commit_v);
-            asset_commit_v.mul_short(layouter.namespace(|| "[asset] ValueCommitV"), (asset, one))?
+            let token_commit_v = OrchardFixedBases::ValueCommitV;
+            let token_commit_v = FixedPoint::from_inner(ecc_chip.clone(), token_commit_v);
+            token_commit_v.mul_short(layouter.namespace(|| "[token] ValueCommitV"), (token, one))?
         };
 
         // r_A * G_2
         let (blind, _rca) = {
-            let rca = self.asset_blind;
-            let asset_commit_r = OrchardFixedBases::ValueCommitR;
-            let asset_commit_r = FixedPoint::from_inner(ecc_chip.clone(), asset_commit_r);
-            asset_commit_r.mul(layouter.namespace(|| "[asset_blind] ValueCommitR"), rca)?
+            let rca = self.token_blind;
+            let token_commit_r = OrchardFixedBases::ValueCommitR;
+            let token_commit_r = FixedPoint::from_inner(ecc_chip.clone(), token_commit_r);
+            token_commit_r.mul(layouter.namespace(|| "[token_blind] ValueCommitR"), rca)?
         };
 
-        // Constrain the asset commitment coordinates
-        let asset_commit = commitment.add(layouter.namespace(|| "assetcommit"), &blind)?;
+        // Constrain the token commitment coordinates
+        let token_commit = commitment.add(layouter.namespace(|| "tokencommit"), &blind)?;
+
         layouter.constrain_instance(
-            asset_commit.inner().x().cell(),
+            token_commit.inner().x().cell(),
             config.primary,
-            BURN_ASSCOMX_OFFSET,
+            BURN_TOKCOMX_OFFSET,
         )?;
+
         layouter.constrain_instance(
-            asset_commit.inner().y().cell(),
+            token_commit.inner().y().cell(),
             config.primary,
-            BURN_ASSCOMY_OFFSET,
+            BURN_TOKCOMY_OFFSET,
         )?;
 
         // ========================

src/crypto/mint_proof.rs

@@ -114,11 +114,11 @@ pub fn create_mint_proof(
         pub_x: Some(*coords.x()),
         pub_y: Some(*coords.y()),
         value: Some(DrkValue::from_u64(value)),
-        asset: Some(token_id),
+        token: Some(token_id),
         serial: Some(serial),
         coin_blind: Some(coin_blind),
         value_blind: Some(value_blind),
-        asset_blind: Some(token_blind),
+        token_blind: Some(token_blind),
     };
 
     let start = Instant::now();

src/crypto/spend_proof.rs

@@ -167,10 +167,10 @@ pub fn create_spend_proof(
         secret_key: Some(secret.0),
         serial: Some(serial),
         value: Some(DrkValue::from_u64(value)),
-        asset: Some(token_id),
+        token: Some(token_id),
         coin_blind: Some(coin_blind),
         value_blind: Some(value_blind),
-        asset_blind: Some(token_blind),
+        token_blind: Some(token_blind),
         leaf_pos: Some(leaf_position as u32),
         merkle_path: Some(merkle_path.try_into().unwrap()),
         sig_secret: Some(signature_secret.0),