renamed 'asset' to 'token' across project

proof/mint.pism

@@ -11,7 +11,7 @@ contract mint_contract
     param value U64
     param token_id Fr
     param randomness_value Fr
-    param randomness_asset Fr
+    param randomness_token Fr
 
     param serial Fr
     param randomness_coin Fr
@@ -21,7 +21,7 @@ start
     u64_as_binary_le value param:value
     fr_as_binary_le token_id param:token_id
     fr_as_binary_le randomness_value param:randomness_value
-    fr_as_binary_le randomness_asset param:randomness_asset
+    fr_as_binary_le randomness_token param:randomness_token
     fr_as_binary_le serial param:serial
     fr_as_binary_le randomness_coin param:randomness_coin
 
@@ -41,7 +41,7 @@ start
     # A = a * G_VCV + r_a * G_VCR
 
     ec_mul_const vca token_id G_VCV
-    ec_mul_const rca randomness_asset G_VCR
+    ec_mul_const rca randomness_token G_VCR
     ec_add ca vca rca
     # emit ca
     emit_ec ca

proof/spend.pism

@@ -13,7 +13,7 @@ contract spend_contract
     param value U64
     param token_id Fr
     param randomness_value Fr
-    param randomness_asset Fr
+    param randomness_token Fr
 
     param serial Fr
     param randomness_coin Fr
@@ -29,7 +29,7 @@ start
     u64_as_binary_le value param:value
     fr_as_binary_le token_id param:token_id
     fr_as_binary_le randomness_value param:randomness_value
-    fr_as_binary_le randomness_asset param:randomness_asset
+    fr_as_binary_le randomness_token param:randomness_token
 
     # Make value commitment
     # V = v * G_VCV + r * G_VCR
@@ -44,7 +44,7 @@ start
     # A = a * G_VCV + r * G_VCR
 
     ec_mul_const vca token_id G_VCV
-    ec_mul_const rca randomness_asset G_VCR
+    ec_mul_const rca randomness_token G_VCR
     ec_add ca vca rca
     # emit ca
     emit_ec ca

src/bin/darkfid.rs

@@ -248,7 +248,7 @@ impl Darkfid {
 
     // --> {"method": "deposit", "params": [network, token, publickey]}
     // The publickey sent here is used so the cashier can know where to send
-    // assets once the deposit is received.
+    // tokens once the deposit is received.
     // <-- {"result": "Ht5G1RhkcKnpLVLMhqJc5aqZ4wYUEbxbtZwGCVbgU7DL"}
     async fn deposit(&self, id: Value, params: Value) -> JsonResult {
         let args = params.as_array();
@@ -290,7 +290,7 @@ impl Darkfid {
         let pubkey = bs58::encode(serialize(&pk)).into_string();
 
         // Send request to cashier. If the cashier supports the requested network
-        // (and token), it shall return a valid address where assets can be deposited.
+        // (and token), it shall return a valid address where tokens can be deposited.
         // If not, an error is returned, and forwarded to the method caller.
         let req = jsonreq(json!("deposit"), json!([network, token_id, pubkey]));
         let rep: JsonResult;
@@ -313,7 +313,7 @@ impl Darkfid {
     // The publickey sent here is the address where the caller wants to receive
     // the tokens they plan to withdraw.
     // On request, send request to cashier to get deposit address, and then transfer
-    // dark assets to the cashier's wallet. Following that, the cashier should return
+    // dark tokens to the cashier's wallet. Following that, the cashier should return
     // a transaction ID of them sending the funds that are requested for withdrawal.
     // <-- {"result": "txID"}
     async fn withdraw(&self, id: Value, params: Value) -> JsonResult {

src/bin/drk.rs

@@ -116,8 +116,8 @@ impl Drk {
 
     // --> {"jsonrpc": "2.0", "method": "deposit", "params": ["solana", "usdc"], "id": 42}
     // <-- {"jsonrpc": "2.0", "result": "Ht5G1RhkcKnpLVLMhqJc5aqZ4wYUEbxbtZwGCVbgU7DL", "id": 42}
-    async fn deposit(&self, network: &str, asset: &str) -> Result<Value> {
-        let req = jsonrpc::request(json!("deposit"), json!([network, asset]));
+    async fn deposit(&self, network: &str, token: &str) -> Result<Value> {
+        let req = jsonrpc::request(json!("deposit"), json!([network, token]));
         Ok(self.request(req).await?)
     }
 
@@ -127,19 +127,19 @@ impl Drk {
     async fn withdraw(
         &self,
         network: &str,
-        asset: &str,
+        token: &str,
         address: &str,
         amount: &str,
     ) -> Result<Value> {
-        let req = jsonrpc::request(json!("withdraw"), json!([network, asset, address, amount]));
+        let req = jsonrpc::request(json!("withdraw"), json!([network, token, address, amount]));
         Ok(self.request(req).await?)
     }
 
     // --> {"jsonrpc": "2.0", "method": "transfer",
     //      "params": ["dusdc", "vdNS7oBj7KvsMWWmo9r96SV4SqATLrGsH2a3PGpCfJC", 13.37], "id": 42}
     // <-- {"jsonrpc": "2.0", "result": "txID", "id": 42}
-    async fn transfer(&self, asset: &str, address: &str, amount: &str) -> Result<Value> {
-        let req = jsonrpc::request(json!("transfer"), json!([asset, address, amount]));
+    async fn transfer(&self, token: &str, address: &str, amount: &str) -> Result<Value> {
+        let req = jsonrpc::request(json!("transfer"), json!([token, address, amount]));
         Ok(self.request(req).await?)
     }
 }
@@ -301,20 +301,20 @@ async fn main() -> Result<()> {
      (about: "Show what features the cashier supports")
     )
     (@subcommand deposit =>
-     (about: "Deposit clear assets for Dark assets")
+     (about: "Deposit clear tokens for Dark tokens")
      (@arg network: +required +takes_value --network
       "Which network to use (bitcoin/solana/...)")
      (@arg TOKENSYM: +required
       "Which token symbol to deposit (btc/sol/usdc...)")
     )
     (@subcommand transfer =>
-     (about: "Transfer Dark assets to address")
+     (about: "Transfer Dark tokens to address")
      (@arg TOKENSYM: +required "Desired token (btc/sol/usdc...)")
      (@arg ADDRESS: +required "Recipient address")
      (@arg AMOUNT: +required "Amount to send")
     )
     (@subcommand withdraw =>
-     (about: "Withdraw Dark assets for clear assets")
+     (about: "Withdraw Dark tokens for clear tokens")
      (@arg network: +required +takes_value --network
       "Which network to use (bitcoin/solana/...)")
      (@arg TOKENSYM: +required "Which token to receive (btc/sol/usdc...)")

src/circuit/mint_contract.rs

@@ -18,7 +18,7 @@ pub struct MintContract {
     pub value: Option<u64>,
     pub token_id: Option<jubjub::Fr>,
     pub randomness_value: Option<jubjub::Fr>,
-    pub randomness_asset: Option<jubjub::Fr>,
+    pub randomness_token: Option<jubjub::Fr>,
     pub serial: Option<jubjub::Fr>,
     pub randomness_coin: Option<jubjub::Fr>,
     pub public: Option<jubjub::SubgroupPoint>,
@@ -46,10 +46,10 @@ impl Circuit<bls12_381::Scalar> for MintContract {
             self.randomness_value,
         )?;
 
-        // Line 23: fr_as_binary_le randomness_asset param:randomness_asset
-        let randomness_asset = boolean::field_into_boolean_vec_le(
-            cs.namespace(|| "Line 23: fr_as_binary_le randomness_asset param:randomness_asset"),
-            self.randomness_asset,
+        // Line 23: fr_as_binary_le randomness_token param:randomness_token
+        let randomness_token = boolean::field_into_boolean_vec_le(
+            cs.namespace(|| "Line 23: fr_as_binary_le randomness_token param:randomness_token"),
+            self.randomness_token,
         )?;
 
         // Line 24: fr_as_binary_le serial param:serial
@@ -100,11 +100,11 @@ impl Circuit<bls12_381::Scalar> for MintContract {
             &token_id,
         )?;
 
-        // Line 43: ec_mul_const rca randomness_asset G_VCR
+        // Line 43: ec_mul_const rca randomness_token G_VCR
         let rca = ecc::fixed_base_multiplication(
-            cs.namespace(|| "Line 43: ec_mul_const rca randomness_asset G_VCR"),
+            cs.namespace(|| "Line 43: ec_mul_const rca randomness_token G_VCR"),
             &zcash_proofs::constants::VALUE_COMMITMENT_RANDOMNESS_GENERATOR,
-            &randomness_asset,
+            &randomness_token,
         )?;
 
         // Line 44: ec_add ca vca rca

src/circuit/spend_contract.rs

@@ -19,7 +19,7 @@ pub struct SpendContract {
     pub value: Option<u64>,
     pub token_id: Option<jubjub::Fr>,
     pub randomness_value: Option<jubjub::Fr>,
-    pub randomness_asset: Option<jubjub::Fr>,
+    pub randomness_token: Option<jubjub::Fr>,
     pub serial: Option<jubjub::Fr>,
     pub randomness_coin: Option<jubjub::Fr>,
     pub secret: Option<jubjub::Fr>,
@@ -50,10 +50,10 @@ impl Circuit<bls12_381::Scalar> for SpendContract {
             self.randomness_value,
         )?;
 
-        // Line 41: fr_as_binary_le randomness_asset param:randomness_asset
-        let randomness_asset = boolean::field_into_boolean_vec_le(
-            cs.namespace(|| "Line 41: fr_as_binary_le randomness_asset param:randomness_asset"),
-            self.randomness_asset,
+        // Line 41: fr_as_binary_le randomness_token param:randomness_token
+        let randomness_token = boolean::field_into_boolean_vec_le(
+            cs.namespace(|| "Line 41: fr_as_binary_le randomness_token param:randomness_token"),
+            self.randomness_token,
         )?;
 
         // Line 46: ec_mul_const vcv value G_VCV
@@ -83,11 +83,11 @@ impl Circuit<bls12_381::Scalar> for SpendContract {
             &token_id,
         )?;
 
-        // Line 47: ec_mul_const rca randomness_asset G_VCR
+        // Line 47: ec_mul_const rca randomness_token G_VCR
         let rca = ecc::fixed_base_multiplication(
-            cs.namespace(|| "Line 47: ec_mul_const rca randomness_asset G_VCR"),
+            cs.namespace(|| "Line 47: ec_mul_const rca randomness_token G_VCR"),
             &zcash_proofs::constants::VALUE_COMMITMENT_RANDOMNESS_GENERATOR,
-            &randomness_asset,
+            &randomness_token,
         )?;
 
         // Line 48: ec_add ca vca rca

src/crypto/mint_proof.rs

@@ -13,7 +13,7 @@ use crate::serial::{Decodable, Encodable};
 
 pub struct MintRevealedValues {
     pub value_commit: jubjub::SubgroupPoint,
-    pub asset_commit: jubjub::SubgroupPoint,
+    pub token_commit: jubjub::SubgroupPoint,
     pub coin: [u8; 32],
 }
 
@@ -22,7 +22,7 @@ impl MintRevealedValues {
         value: u64,
         token_id: jubjub::Fr,
         randomness_value: &jubjub::Fr,
-        randomness_asset: &jubjub::Fr,
+        randomness_token: &jubjub::Fr,
         serial: &jubjub::Fr,
         randomness_coin: &jubjub::Fr,
         public: &jubjub::SubgroupPoint,
@@ -32,10 +32,10 @@ impl MintRevealedValues {
             + (zcash_primitives::constants::VALUE_COMMITMENT_RANDOMNESS_GENERATOR
                 * randomness_value);
 
-        let asset_commit = (zcash_primitives::constants::VALUE_COMMITMENT_VALUE_GENERATOR
+        let token_commit = (zcash_primitives::constants::VALUE_COMMITMENT_VALUE_GENERATOR
             * token_id)
             + (zcash_primitives::constants::VALUE_COMMITMENT_RANDOMNESS_GENERATOR
-                * randomness_asset);
+                * randomness_token);
 
         let mut coin = [0; 32];
         coin.copy_from_slice(
@@ -54,7 +54,7 @@ impl MintRevealedValues {
 
         MintRevealedValues {
             value_commit,
-            asset_commit,
+            token_commit,
             coin,
         }
     }
@@ -73,7 +73,7 @@ impl MintRevealedValues {
         }
 
         {
-            let result = jubjub::ExtendedPoint::from(self.asset_commit);
+            let result = jubjub::ExtendedPoint::from(self.token_commit);
             let affine = result.to_affine();
             let u = affine.get_u();
             let v = affine.get_v();
@@ -101,7 +101,7 @@ impl Encodable for MintRevealedValues {
     fn encode<S: io::Write>(&self, mut s: S) -> Result<usize> {
         let mut len = 0;
         len += self.value_commit.encode(&mut s)?;
-        len += self.asset_commit.encode(&mut s)?;
+        len += self.token_commit.encode(&mut s)?;
         len += self.coin.encode(&mut s)?;
         Ok(len)
     }
@@ -111,7 +111,7 @@ impl Decodable for MintRevealedValues {
     fn decode<D: io::Read>(mut d: D) -> Result<Self> {
         Ok(Self {
             value_commit: Decodable::decode(&mut d)?,
-            asset_commit: Decodable::decode(&mut d)?,
+            token_commit: Decodable::decode(&mut d)?,
             coin: Decodable::decode(d)?,
         })
     }
@@ -125,7 +125,7 @@ pub fn setup_mint_prover() -> groth16::Parameters<Bls12> {
             value: None,
             token_id: None,
             randomness_value: None,
-            randomness_asset: None,
+            randomness_token: None,
             serial: None,
             randomness_coin: None,
             public: None,
@@ -142,7 +142,7 @@ pub fn create_mint_proof(
     value: u64,
     token_id: jubjub::Fr,
     randomness_value: jubjub::Fr,
-    randomness_asset: jubjub::Fr,
+    randomness_token: jubjub::Fr,
     serial: jubjub::Fr,
     randomness_coin: jubjub::Fr,
     public: jubjub::SubgroupPoint,
@@ -151,7 +151,7 @@ pub fn create_mint_proof(
         value,
         token_id,
         &randomness_value,
-        &randomness_asset,
+        &randomness_token,
         &serial,
         &randomness_coin,
         &public,
@@ -161,7 +161,7 @@ pub fn create_mint_proof(
         value: Some(value),
         token_id: Some(token_id),
         randomness_value: Some(randomness_value),
-        randomness_asset: Some(randomness_asset),
+        randomness_token: Some(randomness_token),
         serial: Some(serial),
         randomness_coin: Some(randomness_coin),
         public: Some(public),

src/crypto/spend_proof.rs

@@ -16,7 +16,7 @@ use crate::serial::{Decodable, Encodable};
 
 pub struct SpendRevealedValues {
     pub value_commit: jubjub::SubgroupPoint,
-    pub asset_commit: jubjub::SubgroupPoint,
+    pub token_commit: jubjub::SubgroupPoint,
     pub nullifier: Nullifier,
     // This should not be here, we just have it for debugging
     //coin: [u8; 32],
@@ -30,7 +30,7 @@ impl SpendRevealedValues {
         value: u64,
         token_id: jubjub::Fr,
         randomness_value: &jubjub::Fr,
-        randomness_asset: &jubjub::Fr,
+        randomness_token: &jubjub::Fr,
         serial: &jubjub::Fr,
         randomness_coin: &jubjub::Fr,
         secret: &jubjub::Fr,
@@ -42,10 +42,10 @@ impl SpendRevealedValues {
             + (zcash_primitives::constants::VALUE_COMMITMENT_RANDOMNESS_GENERATOR
                 * randomness_value);
 
-        let asset_commit = (zcash_primitives::constants::VALUE_COMMITMENT_VALUE_GENERATOR
+        let token_commit = (zcash_primitives::constants::VALUE_COMMITMENT_VALUE_GENERATOR
             * token_id)
             + (zcash_primitives::constants::VALUE_COMMITMENT_RANDOMNESS_GENERATOR
-                * randomness_asset);
+                * randomness_token);
 
         let mut nullifier = [0; 32];
         nullifier.copy_from_slice(
@@ -99,7 +99,7 @@ impl SpendRevealedValues {
 
         SpendRevealedValues {
             value_commit,
-            asset_commit,
+            token_commit,
             nullifier,
             merkle_root,
             signature_public,
@@ -122,7 +122,7 @@ impl SpendRevealedValues {
 
         // CA
         {
-            let result = jubjub::ExtendedPoint::from(self.asset_commit);
+            let result = jubjub::ExtendedPoint::from(self.token_commit);
             let affine = result.to_affine();
             //let (u, v) = (affine.get_u(), affine.get_v());
             let u = affine.get_u();
@@ -178,7 +178,7 @@ impl Encodable for SpendRevealedValues {
     fn encode<S: io::Write>(&self, mut s: S) -> Result<usize> {
         let mut len = 0;
         len += self.value_commit.encode(&mut s)?;
-        len += self.asset_commit.encode(&mut s)?;
+        len += self.token_commit.encode(&mut s)?;
         len += self.nullifier.encode(&mut s)?;
         len += self.merkle_root.encode(&mut s)?;
         len += self.signature_public.encode(s)?;
@@ -190,7 +190,7 @@ impl Decodable for SpendRevealedValues {
     fn decode<D: io::Read>(mut d: D) -> Result<Self> {
         Ok(Self {
             value_commit: Decodable::decode(&mut d)?,
-            asset_commit: Decodable::decode(&mut d)?,
+            token_commit: Decodable::decode(&mut d)?,
             nullifier: Decodable::decode(&mut d)?,
             merkle_root: Decodable::decode(&mut d)?,
             signature_public: Decodable::decode(d)?,
@@ -206,7 +206,7 @@ pub fn setup_spend_prover() -> groth16::Parameters<Bls12> {
             value: None,
             token_id: None,
             randomness_value: None,
-            randomness_asset: None,
+            randomness_token: None,
             serial: None,
             randomness_coin: None,
             secret: None,
@@ -228,7 +228,7 @@ pub fn create_spend_proof(
     value: u64,
     token_id: jubjub::Fr,
     randomness_value: jubjub::Fr,
-    randomness_asset: jubjub::Fr,
+    randomness_token: jubjub::Fr,
     serial: jubjub::Fr,
     randomness_coin: jubjub::Fr,
     secret: jubjub::Fr,
@@ -246,7 +246,7 @@ pub fn create_spend_proof(
         value: Some(value),
         token_id: Some(token_id),
         randomness_value: Some(randomness_value),
-        randomness_asset: Some(randomness_asset),
+        randomness_token: Some(randomness_token),
         serial: Some(serial),
         randomness_coin: Some(randomness_coin),
         secret: Some(secret),
@@ -265,7 +265,7 @@ pub fn create_spend_proof(
         value,
         token_id,
         &randomness_value,
-        &randomness_asset,
+        &randomness_token,
         &serial,
         &randomness_coin,
         &secret,

src/state.rs

@@ -62,7 +62,7 @@ impl fmt::Display for VerifyFailed {
                 f.write_str("Money in does not match money out (value commits)")
             }
             VerifyFailed::AssetMismatch => {
-                f.write_str("Assets don't match some inputs or outputs (asset commits)")
+                f.write_str("Assets don't match some inputs or outputs (token commits)")
             }
         }
     }
@@ -80,7 +80,6 @@ pub fn state_transition<S: ProgramState>(
         // Check the public key in the clear inputs
         // It should be a valid public key for the cashier
 
-
         if !state.is_valid_cashier_public_key(&input.signature_public) {
             log::error!(target: "STATE TRANSITION", "Not valid cashier public key");
             return Err(VerifyFailed::InvalidCashierKey(i));

src/tx/builder.rs

@@ -66,7 +66,7 @@ impl TransactionBuilder {
         spend_params: &groth16::Parameters<Bls12>,
     ) -> Transaction {
         let mut clear_inputs = vec![];
-        let asset_commit_blind: jubjub::Fr = jubjub::Fr::random(&mut OsRng);
+        let token_commit_blind: jubjub::Fr = jubjub::Fr::random(&mut OsRng);
         for input in &self.clear_inputs {
             let signature_public =
                 zcash_primitives::constants::SPENDING_KEY_GENERATOR * input.signature_secret;
@@ -76,7 +76,7 @@ impl TransactionBuilder {
                 value: input.value,
                 token_id: input.token_id,
                 valcom_blind,
-                asset_commit_blind,
+                token_commit_blind,
                 signature_public,
             };
             clear_inputs.push(clear_input);
@@ -105,7 +105,7 @@ impl TransactionBuilder {
                 input.note.value,
                 input.note.token_id,
                 input.note.valcom_blind,
-                asset_commit_blind,
+                token_commit_blind,
                 input.note.serial,
                 input.note.coin_blind,
                 input.secret,
@@ -143,7 +143,7 @@ impl TransactionBuilder {
                 output.value,
                 output.token_id,
                 valcom_blind,
-                asset_commit_blind,
+                token_commit_blind,
                 serial,
                 coin_blind,
                 output.public,

src/tx/mod.rs

@@ -31,7 +31,7 @@ pub struct TransactionClearInput {
     pub value: u64,
     pub token_id: jubjub::Fr,
     pub valcom_blind: jubjub::Fr,
-    pub asset_commit_blind: jubjub::Fr,
+    pub token_commit_blind: jubjub::Fr,
     pub signature_public: jubjub::SubgroupPoint,
     pub signature: schnorr::Signature,
 }
@@ -62,23 +62,23 @@ impl Transaction {
             + (zcash_primitives::constants::VALUE_COMMITMENT_RANDOMNESS_GENERATOR * blind)
     }
 
-    fn verify_asset_commitments(&self) -> bool {
+    fn verify_token_commitments(&self) -> bool {
         assert_ne!(self.outputs.len(), 0);
-        let asset_commit_value = self.outputs[0].revealed.asset_commit;
+        let token_commit_value = self.outputs[0].revealed.token_commit;
 
         let mut failed = self
             .inputs
             .iter()
-            .any(|input| input.revealed.asset_commit != asset_commit_value);
+            .any(|input| input.revealed.token_commit != token_commit_value);
         failed = failed
             || self
                 .outputs
                 .iter()
-                .any(|output| output.revealed.asset_commit != asset_commit_value);
+                .any(|output| output.revealed.token_commit != token_commit_value);
         failed = failed
             || self.clear_inputs.iter().any(|input| {
-                Self::compute_pedersen_commit(input.token_id, &input.asset_commit_blind)
-                    != asset_commit_value
+                Self::compute_pedersen_commit(input.token_id, &input.token_commit_blind)
+                    != token_commit_value
             });
         !failed
     }
@@ -110,8 +110,8 @@ impl Transaction {
             return Err(state::VerifyFailed::MissingFunds);
         }
 
-        // Verify asset commitments match
-        if !self.verify_asset_commitments() {
+        // Verify token commitments match
+        if !self.verify_token_commitments() {
             return Err(state::VerifyFailed::AssetMismatch);
         }
 
@@ -142,7 +142,7 @@ impl TransactionClearInput {
             value: partial.value,
             token_id: partial.token_id,
             valcom_blind: partial.valcom_blind,
-            asset_commit_blind: partial.asset_commit_blind,
+            token_commit_blind: partial.token_commit_blind,
             signature_public: partial.signature_public,
             signature,
         }
@@ -153,7 +153,7 @@ impl TransactionClearInput {
         len += self.value.encode(&mut s)?;
         len += self.token_id.encode(&mut s)?;
         len += self.valcom_blind.encode(&mut s)?;
-        len += self.asset_commit_blind.encode(&mut s)?;
+        len += self.token_commit_blind.encode(&mut s)?;
         len += self.signature_public.encode(s)?;
         Ok(len)
     }
@@ -202,7 +202,7 @@ impl Encodable for TransactionClearInput {
         len += self.value.encode(&mut s)?;
         len += self.token_id.encode(&mut s)?;
         len += self.valcom_blind.encode(&mut s)?;
-        len += self.asset_commit_blind.encode(&mut s)?;
+        len += self.token_commit_blind.encode(&mut s)?;
         len += self.signature_public.encode(&mut s)?;
         len += self.signature.encode(s)?;
         Ok(len)
@@ -215,7 +215,7 @@ impl Decodable for TransactionClearInput {
             value: Decodable::decode(&mut d)?,
             token_id: Decodable::decode(&mut d)?,
             valcom_blind: Decodable::decode(&mut d)?,
-            asset_commit_blind: Decodable::decode(&mut d)?,
+            token_commit_blind: Decodable::decode(&mut d)?,
             signature_public: Decodable::decode(&mut d)?,
             signature: Decodable::decode(d)?,
         })

src/tx/partial.rs

@@ -18,7 +18,7 @@ pub struct PartialTransactionClearInput {
     pub value: u64,
     pub token_id: jubjub::Fr,
     pub valcom_blind: jubjub::Fr,
-    pub asset_commit_blind: jubjub::Fr,
+    pub token_commit_blind: jubjub::Fr,
     pub signature_public: jubjub::SubgroupPoint,
 }
 
@@ -53,7 +53,7 @@ impl Encodable for PartialTransactionClearInput {
         len += self.value.encode(&mut s)?;
         len += self.token_id.encode(&mut s)?;
         len += self.valcom_blind.encode(&mut s)?;
-        len += self.asset_commit_blind.encode(&mut s)?;
+        len += self.token_commit_blind.encode(&mut s)?;
         len += self.signature_public.encode(&mut s)?;
         Ok(len)
     }
@@ -64,7 +64,7 @@ impl Decodable for PartialTransactionClearInput {
             value: Decodable::decode(&mut d)?,
             token_id: Decodable::decode(&mut d)?,
             valcom_blind: Decodable::decode(&mut d)?,
-            asset_commit_blind: Decodable::decode(&mut d)?,
+            token_commit_blind: Decodable::decode(&mut d)?,
             signature_public: Decodable::decode(&mut d)?,
         })
     }