Skip to content

Commit ea142af

Browse files
soralitsoralit
committed
fix: adjust transaction signing code
1 parent 2cbe0de commit ea142af

File tree

24 files changed

+320
-195
lines changed

24 files changed

+320
-195
lines changed

‎rust/Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust/apps/zcash/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ app_utils = { workspace = true }
1212
bitcoin = { workspace = true }
1313
thiserror = { workspace = true }
1414
zcash_vendor = { workspace = true }
15+
hex = { workspace = true }
1516

1617
[dev-dependencies]
1718
keystore = { path = "../../keystore" }

‎rust/apps/zcash/src/pczt.rs

+119-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use zcash_vendor::pczt::pczt_ext::{PcztSigner, ZcashSignature};
77
use crate::errors::ZcashError;
88

99
struct SeedSigner {
10-
seed: [u8; 32],
10+
seed: [u8; 64],
1111
}
1212

1313
impl PcztSigner for SeedSigner {
@@ -42,3 +42,121 @@ impl PcztSigner for SeedSigner {
4242
.map_err(|e| ZcashError::SigningError(e.to_string()))
4343
}
4444
}
45+
46+
#[cfg(test)]
47+
mod tests {
48+
use alloc::{collections::btree_map::BTreeMap, vec};
49+
use zcash_vendor::pczt::{
50+
common::Global,
51+
orchard::{self, Action},
52+
sapling, transparent, Pczt, Version, V5_TX_VERSION, V5_VERSION_GROUP_ID,
53+
};
54+
55+
use super::*;
56+
57+
extern crate std;
58+
use std::println;
59+
60+
#[test]
61+
fn test_pczt_sign() {
62+
let seed = hex::decode("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").unwrap();
63+
let signer = SeedSigner {
64+
seed: seed.try_into().unwrap(),
65+
};
66+
67+
let pczt = Pczt {
68+
version: Version::V0,
69+
transparent: transparent::Bundle {
70+
inputs: vec![],
71+
outputs: vec![],
72+
},
73+
sapling: sapling::Bundle {
74+
anchor: None,
75+
spends: vec![],
76+
outputs: vec![],
77+
value_balance: 0,
78+
bsk: None,
79+
},
80+
orchard: orchard::Bundle {
81+
anchor: Some(hex::decode("a6c1ad5befd98da596ebe78491d76f76402f3400bf921f73a3b176bd70ab5000").unwrap().try_into().unwrap()),
82+
actions: vec![
83+
Action {
84+
cv: hex::decode("4ac2480c13624d2b8aabf82ee808b4e4965d6c26efd9cfc9070f69e1a9a69609").unwrap().try_into().unwrap(),
85+
spend: orchard::Spend {
86+
value: None,
87+
witness: None,
88+
alpha: Some(hex::decode("105dd4f80b149ee6a8d5f11b2d0f7d0caa7cece6d0dce3ce494ce14977def354").unwrap().try_into().unwrap()),
89+
fvk: None,
90+
proprietary: BTreeMap::new(),
91+
recipient: None,
92+
rho: None,
93+
rseed: None,
94+
nullifier: hex::decode("ef870733c09572b274782e32e28809c201a90c1e179ad78e88eb1477c7bd9631").unwrap().try_into().unwrap(),
95+
rk: hex::decode("7fe9364e043a92f893100dc09fc70f1a4faad022687767f8c3495a83a57e6726").unwrap().try_into().unwrap(),
96+
spend_auth_sig: None,
97+
},
98+
output: orchard::Output {
99+
cmx: hex::decode("dbc7cc05319a4c70a6792ec195e99f1f3028194338953ee28f2f9426e06e1039").unwrap().try_into().unwrap(),
100+
ephemeral_key: hex::decode("c7a4a801f5a0cf4380263eed1acc4952ecc61805a6bc4c17ce0fe783aa8f582e").unwrap().try_into().unwrap(),
101+
enc_ciphertext: hex::decode("212c8799c5cc99400f3c1685820fd7d6b86a155f43b35d803aab357ef65f95430c922192e3a5c9d0e23d34a39d4257d2361c6f7ffbe386e4573ace688854f1c45ff08644d1ec4de6ad877104f9172cffbbcaf97993eac6a54b426c492697dcfe15461a661a0dd770696f1e6a59b3d280034b38f96cecfb8bb8c3ee642640887e021cc06406c1dc94a1d0c1e71bdb864bd97e1ca6beb25bcdb5bb756ca209da24aea0cfe45f65e159ad395e78133bd56c227da05778df4368fbb5247bb33cddafc7fefd67a8cb26d7b8841896f3e7ca57e218273335851e980ee470a7995e7ff179eb4a566ca8a7aca67cee124b8d8fd32072804d288f9db115edabb90b2cb3121dcb6069f8cb0809e1d53e1b71182f6a903436fe6685706d0e089e2cef276b27e7cd0a32230e1da7f5ded3edd136dc263f4913b1fd519eefd7f4a23dbfa8c530807e2c352b1b2e4d69cce2ffc506e85bba1dbf0daf212bc5ec204964aa26329071ae19cfc2614b7e6f2b5f0b831b1dafaa91e1b2e0e46f7d6b7e6870209cf10fc13908b88d079802f3e2fa2a62a3a88dd7fba600655948ff716ee6e7ee76f2deeb32a2cac8726168dcedad7584c9b42a4938b617b605f3e7acde18f8f5b5495ecd5ccbb7c9d86888b8f6a236cb79eced16eb41dbe884382d78dd26768d7110843aa3e3804c0757768458d4556f69e8887d1cbbd3f3ab0c9eb0b66319052a6089a94fb769ecf80930ae87cf04d282eb4fcaa24e5959c3b535ff99ba2ecb0f71931035f37f9875c944bdbd741adb95d5fed3ddbb78585c21f58c3d74a6cc18418e8537e1b8").unwrap().try_into().unwrap(),
102+
out_ciphertext: hex::decode("6295187eb1d8dc74a065d46ae2bc235a47e5914b4320419e1312157ca16f153269e44278ad6f999a3899dfa6d004ce685cd7759a33112b26e5359dc7fe7ec3d81429854b4bbf767857120d14019353e5").unwrap().try_into().unwrap(),
103+
ock: None,
104+
proprietary: BTreeMap::new(),
105+
recipient: None,
106+
rseed: None,
107+
shared_secret: None,
108+
value: None,
109+
},
110+
rcv: None,
111+
},
112+
Action {
113+
cv: hex::decode("6c78ee94ced314a28898218fb3d9594ff97b96d7d92c71f9e1866731eddd3ca8").unwrap().try_into().unwrap(),
114+
spend: orchard::Spend {
115+
value: None,
116+
witness: None,
117+
alpha: Some(hex::decode("15716c9c0c9af80201b63a1b0a329fd9579824cfae4cd9f086848d729dd37cff").unwrap().try_into().unwrap()),
118+
fvk: None,
119+
proprietary: BTreeMap::new(),
120+
recipient: None,
121+
rho: None,
122+
rseed: None,
123+
nullifier: hex::decode("0e65a80237a3d3e1dcede4fe7632eec67254e0e1af721cd20fa8b9800263f508").unwrap().try_into().unwrap(),
124+
rk: hex::decode("afa2899a1fc1f5d16639e162979b29bedbf84aeb0987a2d8143d10134a47f722").unwrap().try_into().unwrap(),
125+
spend_auth_sig: None,
126+
},
127+
output: orchard::Output {
128+
cmx: hex::decode("c7e391d7deb77891735e12be5f63e8821a79636a774578706bf495bef678072b").unwrap().try_into().unwrap(),
129+
ephemeral_key: hex::decode("b306bb760dc8b8018db27ee58072969d1665b98095b41034615d4ff62410800f").unwrap().try_into().unwrap(),
130+
enc_ciphertext: hex::decode("572b855e2c2b872eb6d9e375831a34b486833a015d0d42876c8b8b47409aa67d238903a931539466b12645d0e7f18ad6637fc81152b145585511245a48b9e4a20069dcf3d10aef699388f6a1855567c5312d66a94724db45c10ae0bc4a6af7fa508b4184859a1bfc38dbed7258b39406a64af9a401ab9d921f74fd8fb2f44893458d9a0fd67c773a8d65ecffe2f0868755b8e359ab3b7bf6ebce2553745b96d31bdcea662188691f9fc12fd652b8528e6339924c66f12e39e4b1b3041fde91cef49b7c9f4c0201e22f712ecc599219acdc4d5c77b795ebe3c80a701e22780274c2f88298fa40af2bcba9b78b258e80bebf5bf962c82e020e7444aafa3c857f8fefe5c2c79627873e334af336defc71c772c472840228cd6a7a870ff16efc2204d232b1f4da4b17ca5c9dee367c7aecd0f1deb9ec65f6c03f26ec95c6e9f03f5da0419260be47703ac2a56467883a272858625cb64bd3c0e388a15197665493377984c78aee751bab65971ea0b511879b6339856d724780250843a34af9462c765ac5200b22b6a35341c73ef4da9fc82087f3fa9dfb6ce6434a1e60b6c15beedfa3a8ca2feeeb249fb73154d541c4ced12936fe5ab6b0ac989eee5d045a36659d31d7352f77db6c32b8a827a456ce93bcd8f69e9b3b17ba2f44016107a886392af6c413e54d3707008573d2b393693616dae726e2e1ae52e437a0a5bab14ffe5ea26df3be381770fa9fce263a0adfbf4bf5182826c573da06d83011e85dbb16866099de5dc79465f46b29552565eede84f36ae0b443ea05e46a97362be8796bb635549108").unwrap().try_into().unwrap(),
131+
out_ciphertext: hex::decode("f60df073061724815f4ae663a99a6781fc5ca797390541172c5cf8b4fece3d45a07d97636853bdaec1758fa8ba339b935462ff4bc23ced395990a6551fcee705d092bcd33a0a68c41f2cd15d59128060").unwrap().try_into().unwrap(),
132+
ock: None,
133+
proprietary: BTreeMap::new(),
134+
recipient: None,
135+
rseed: None,
136+
shared_secret: None,
137+
value: None,
138+
},
139+
rcv: None,
140+
}
141+
],
142+
flags: 3,
143+
value_balance: 10000,
144+
zkproof: None,
145+
bsk: None,
146+
},
147+
global: Global {
148+
tx_version: V5_TX_VERSION,
149+
version_group_id: V5_VERSION_GROUP_ID,
150+
consensus_branch_id: 0xc2d6_d0b4,
151+
lock_time: 0,
152+
expiry_height: 2705733,
153+
proprietary: BTreeMap::new(),
154+
},
155+
};
156+
157+
let signed = pczt.sign(&signer).unwrap();
158+
159+
assert_eq!("274d411da4e2cdeab282ac5b61b6b2acb0d6edfe9b9fc6282c200ed621a581a1234b44710fedee313667cc315d896ec69bb0e233b9897bf3fea2820f84757419", hex::encode(signed.orchard.actions[0].spend.spend_auth_sig.unwrap()));
160+
assert_eq!("cc49f7b09c5d2bb2ed55390da728e7a37639d461b040183a8ac87020d8236f1db920b3b162c41bfeba278c170702716e81db09320e4ce69fda4095c53091052f", hex::encode(signed.orchard.actions[1].spend.spend_auth_sig.unwrap()));
161+
}
162+
}

‎rust/keystore/src/algorithms/zcash/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ pub fn sign_message_orchard(
5757
let rng_seed = alpha.clone();
5858
let rng = ChaCha8Rng::from_seed(rng_seed);
5959
let osk = SpendingKey::from_zip32_seed(seed, coin_type, account_id).unwrap();
60+
6061
let osak = SpendAuthorizingKey::from(&osk);
6162
let randm = Fq::from_repr(alpha)
6263
.into_option()

‎rust/zcash_vendor/src/orchard/address.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub struct Address {
1919
}
2020

2121
impl Address {
22-
pub(crate) fn from_parts(d: Diversifier, pk_d: DiversifiedTransmissionKey) -> Self {
22+
pub fn from_parts(d: Diversifier, pk_d: DiversifiedTransmissionKey) -> Self {
2323
// We assume here that pk_d is correctly-derived from d. We ensure this for
2424
// internal APIs. For parsing from raw byte encodings, we assume that users aren't
2525
// modifying internals of encoded address formats. If they do, that can result in
@@ -32,11 +32,11 @@ impl Address {
3232
self.d
3333
}
3434

35-
pub(crate) fn g_d(&self) -> NonIdentityPallasPoint {
35+
pub fn g_d(&self) -> NonIdentityPallasPoint {
3636
diversify_hash(self.d.as_array())
3737
}
3838

39-
pub(crate) fn pk_d(&self) -> &DiversifiedTransmissionKey {
39+
pub fn pk_d(&self) -> &DiversifiedTransmissionKey {
4040
&self.pk_d
4141
}
4242

‎rust/zcash_vendor/src/orchard/constants.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pub const COMMIT_IVK_PERSONALIZATION: &str = "z.cash:Orchard-CommitIvk";
22

33
/// $\ell^\mathsf{Orchard}_\mathsf{base}$
4-
pub(crate) const L_ORCHARD_BASE: usize = 255;
4+
pub const L_ORCHARD_BASE: usize = 255;
55

66
/// SWU hash-to-curve personalization for the group hash for key diversification
77
pub const KEY_DIVERSIFICATION_PERSONALIZATION: &str = "z.cash:Orchard-gd";

0 commit comments

Comments
 (0)