3a20176092
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2022-01-27 15:00:37 -07:00
132df78a31
Add serialization and deserialization for AccountPubKey
2022-01-27 08:52:12 -07:00
6fcdfda69e
Derive OVKs from transparent account-level key, not child keys.
...
This also renames a number of legacy key types to better reflect
their intended use.
2022-01-26 13:36:27 -07:00
0b43535203
Move OutgoingViewingKey to zcash_primitives::keys
2022-01-25 08:53:51 -07:00
f58d191439
Move transparent account keys to zcash_primitives.
2022-01-25 08:53:51 -07:00
72c2e54a7b
Add explicit serialize and deserialize methods to ExternalPubKey
...
The serialization defined by HDWallet for the fields of ExtendedPubKey
is in the opposite field order from what is defined in ZIP 316.
2022-01-24 16:25:06 -07:00
8b0c1c4ab2
transparent::ExternalPubKey: impl TryFrom for &[u8; 65].
2022-01-24 14:41:40 +08:00
4068075ffd
Merge remote-tracking branch 'upstream/non-consensus-changes-on-branchid-37519621' into autoshield-poc-daa
2022-01-22 23:10:47 -07:00
4dac37ffde
Ensure that transparent input functionality is correctly feature-flagged.
2022-01-22 22:33:22 -07:00
a7ea5f0bc1
Implement TryFrom<&[u8] for ExternalPubKey.
2022-01-22 22:29:45 -07:00
c9fe8402e2
Use transparent internal ovk in shield_transparent_funds().
2022-01-22 22:29:45 -07:00
5033d29d2f
zip316::transparent: Implement ZIP 316 transparent internal ovk.
2022-01-22 22:29:45 -07:00
a4c9f53a3a
Move ExternalPrivKey, ExternalPubKey to zcash_primitives.
2022-01-22 22:29:45 -07:00
7c03dbdc95
Add convenience method for amount sums.
2022-01-21 16:48:53 -07:00
eb80138cf9
Document new APIs for deriving internal keys.
2022-01-21 10:49:17 +08:00
82c1d87dcd
Fix incorrect length of blake2b hashes for internal key derivation.
...
Co-authored-by: str4d <jack@electriccoin.co>
2022-01-20 18:08:01 -07:00
37e6d3a2bc
Apply suggestions from code review
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
Co-authored-by: ying tong <yingtong@z.cash>
2022-01-20 16:43:57 -07:00
3dd1f310d9
Merge remote-tracking branch 'upstream/non-consensus-changes-on-branchid-37519621' into autoshield-poc-daa
2022-01-20 13:54:38 -07:00
da3833f906
Fix missing use of `dk` in derivation of sapling internal FVK.
...
Also, factor out sapling internal fvk derivation so that it only
requires (fvk, dk) since we may not have the full extfvk.
2022-01-20 13:50:12 -07:00
f6f5096ae4
Derive Sapling internal full viewing key.
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2022-01-20 13:50:12 -07:00
a98010a684
Derive Sapling internal spending key.
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2022-01-20 13:50:12 -07:00
eaa3ec56d0
Apply suggestions from code review
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2022-01-19 08:32:59 -07:00
7b2f9e27ae
Rename script_code to script_pubkey in zip244 test vectors.
2022-01-19 08:32:59 -07:00
fc82801d3d
Update v5 transparent signature hashes to always commit to scriptPubKey
2022-01-19 08:32:59 -07:00
3c6e19f4e4
Update test vectors.
2022-01-19 08:32:59 -07:00
37fdf88462
Make hash_type a property of the SignableInput::Transparent
2022-01-19 08:32:59 -07:00
145d1a57f7
Make transparent signatures commit to all input amounts & scripts.
...
Transparent UTXOs are referred as pair of previous txid and index. In
order to verify UTXO's amount in HWW (hardware wallet), whole previous
transaction containing this UTXO must be streamed into the device. This
increases complexity of signing process significantly.
zcash/zips#574 identifies this problem and suggests a modification
to ZIP-244 to resolve this issue, by adding three new fields to
section S.2 of the signature hash.
2022-01-19 08:32:59 -07:00
07a95d70c9
incrementalmerkletree 0.2
2021-12-17 23:46:00 +00:00
e148ca84ba
Migrate to latest `zcash_note_encryption` API
2021-12-17 05:34:45 +00:00
c72ddb1251
Improve documentation of DiversifierKey#diversifier_index
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-12-13 13:37:11 -07:00
8e934682bb
Add decryption of Sapling diversifiers.
...
Given a diversifier key, decrypts a diversifier to obtain
the diversifier index from which the diversifier was originally
produced.
Co-authored-by: str4d <jack@electriccoin.co>
2021-12-13 13:08:58 -07:00
06bea7f936
Factors out sapling address generation from SaplingExtendedFullViewingKey.
...
Sapling address generation depends only on an FVK and
a diversifier key. For the purpose of unified full viewing
keys, we need to break the dependence upon Sapling extended
full viewing keys, so this makes the address generation
methods of SaplingExtendedFullViewingKey usable without
coupling them to the ability to derive child full viewing keys.
2021-11-30 20:00:36 -07:00
0b9d7e4303
Merge remote-tracking branch 'upstream/master' into autoshield-poc-daa
2021-11-24 15:48:02 -07:00
5055033c31
zcash_primitives: Migrate to `zcash_note_encryption::BatchDomain`
2021-11-17 12:17:10 +00:00
fc0dd8e3eb
Merge remote-tracking branch 'upstream/master' into autoshield-poc-daa
2021-10-25 13:24:03 -06:00
48340a4846
Fix doc comment for default address generation.
2021-10-15 13:19:25 -06:00
86d4affe73
Add tests for `ExtendedFullViewingKey::address`
2021-10-11 16:34:37 -06:00
70e65081c5
Add a test for DiversifierKey::diversifier
2021-10-11 16:34:37 -06:00
120cc70a6d
Fix type of default_address
2021-10-11 16:34:37 -06:00
bec497f6bf
Apply suggestions from code review
...
Co-authored-by: ying tong <yingtong@z.cash>
2021-10-11 16:34:37 -06:00
1373221439
Renames the `ExtendedFullViewingKey::address` method to `find_address`.
...
This also adds a new semantically different `address` method which
attempts to produce an address given the specified diversifier index,
and returns `None` if that index does not produce a valid diversifier.
It is then up to the caller to search the diversifier index space if
the diversifier index that they are attempting to use does not result in
a valid diversifier.
2021-10-11 16:34:37 -06:00
28112de234
Make it possible for callers to search for valid Sapling diversifiers.
2021-10-11 16:34:37 -06:00
6cf0749ac9
Merge remote-tracking branch 'upstream/master' into autoshield-poc-reorder
2021-10-01 11:03:41 -06:00
b29803ae34
Update ZIP 244 test vectors with new consensus branch ID
2021-09-28 22:31:11 +01:00
a90af6cb2d
Update NU5 consensus branch ID and set testnet activation height
2021-09-28 22:12:31 +01:00
4770675542
Bump Orchard patch to include Merkle path cleanups
2021-09-16 22:55:22 +01:00
eae4ac4110
`impl memuse::DynamicUsage for Amount`
...
Required to use `DynamicUsage` with `orchard::Bundle<_, Amount>`.
2021-09-14 20:48:58 +01:00
65e1d32774
ff 0.11, group 0.11, etc.
2021-09-09 18:20:37 +01:00
427e6acbd4
Allow CompactSize deserialization to target any type that can be TryFrom<u64>
2021-09-01 13:57:51 -06:00
edcde252de
Merge pull request #428 from nuttycom/public_compact_size
...
Move the CompactSize, Vector, Array and Option encodings to a new zcash_encoding crate.
2021-09-01 20:45:28 +01:00
c1bad64fbd
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-09-01 11:08:52 -06:00
fa092da456
Fix stray clippy complaints.
2021-08-31 13:19:24 -06:00
ef98c7e48c
Add zcash_encoding crate.
...
The CompactSize type, and the standardized encodings for the Vector,
Array and Option types are moved to the newly created crate.
2021-08-31 13:19:24 -06:00
f03f05f251
zcash_note_encryption: Switch to chacha20poly1305 crate
2021-08-30 15:03:39 +01:00
edd7471d90
Merge remote-tracking branch 'upstream/master' into autoshield-poc-daa
2021-08-27 11:08:50 -06:00
ac139c6e9b
Make CompactSize serialization functions public.
2021-08-25 09:55:08 -06:00
9be36f3e54
Merge pull request #417 from nuttycom/incremental_merkle_tree_ser
...
Add manual serialization for bridgetree::Frontier
2021-08-17 14:57:59 +01:00
77bb78d960
Apply suggestions from code review.
2021-08-17 07:31:15 -06:00
1ed538b655
Fix clippy complaints.
2021-08-16 17:36:07 -06:00
7b953283ce
Add blanket implementation of Hashable for incrementalmerkletree::Hashable + HashSer
2021-08-16 13:48:37 -06:00
837ad19262
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-08-16 10:20:14 -06:00
5ba7bbc53b
Serialize `Option` values by value, not by reference.
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-08-16 10:06:38 -06:00
b783c4d0e7
Merge remote-tracking branch 'upstream/master' into autoshield-poc-daa
2021-08-12 11:21:30 -06:00
98dc330cdb
Merge pull request #424 from daira/zip339-primitives
...
ZIP 339 support
2021-08-12 07:23:15 -06:00
d8410063ab
zcash_primitives: Implement `Domain::batch_epk` for `jubjub`
2021-08-11 00:21:00 +01:00
45521c7849
zcash_primitives: Test that batched trial decryption matches unbatched
2021-08-11 00:18:39 +01:00
d0026b460b
zcash_primitives: Implement batched trial decryption optimisation
2021-08-10 02:17:10 +01:00
279a8b6bb6
Use `EphemeralKeyBytes` type in place of `[u8; 32]`
2021-08-09 21:28:42 +01:00
d1443e5049
ZIP 339 support.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2021-08-07 01:07:54 +01:00
83c6a2d1ca
Store OutputDescription `ephemeral_key` as bytes
...
This removes an unnecessary `to_bytes` during trial decryption of notes,
and more closely matches the protocol spec. We retain the consensus rule
canonicity check on epk due to `SaplingVerificationContext::check_output`
taking a `jubjub::ExtendedPoint`, forcing `zcashd` to parse the bytes.
2021-08-06 16:54:48 +01:00
2945905d52
Implement manual serialization for incremental Merkle tree components.
...
This also adds parsing of the legacy CommitmentTree format,
to permit easy migration of persisted data.
2021-08-05 09:32:44 -06:00
232feb71be
Use orchard::Flags::to_byte/from_byte
2021-07-29 10:38:43 -06:00
3b8f0214eb
Move Orchard bundle commitments to the `orchard` crate.
2021-07-29 10:38:43 -06:00
105f8da91f
Update `nonempty` and `orchard` dependencies.
2021-06-30 12:57:56 -06:00
1ae2bd727c
Fix clippy complaints
2021-06-23 16:37:48 -06:00
69ee9f8ca5
Bump orchard deps
...
Includes additional patched dependencies, now that the orchard crate is
not pinning specific revisions of the in-development crates.
2021-06-15 20:20:53 +01:00
00b3e427e6
impl From<Amount> for orchard::ValueSum
...
This is necessary in order to be able to calculate bvk for Orchard
bundles.
2021-06-14 11:41:02 +01:00
c7c79d266e
zcash_note_encryption: Add `ShieldedOutput::ephemeral_key() -> EphemeralKeyBytes`
...
This replaces the `ShieldedOutput::epk() -> &Domain::EphemeralPublicKey`
which could not be satisfied by output types that did not parse epk.
2021-06-10 18:35:19 +01:00
3915abd0a1
Merge pull request #399 from str4d/zip-244-auth-digest-test-vectors
...
Bring in ZIP 244 auth digest test vectors.
2021-06-08 19:47:55 +01:00
684fd504a8
ZIP 244: Write transparent scripts in their consensus encoding
2021-06-08 18:47:34 +01:00
fe07fb3c51
Merge pull request #396 from str4d/394-zip-216
...
Impl ZIP 216 on SaplingVerificationContext and redjubjub::PublicKey
2021-06-08 18:34:47 +01:00
31ea91ced8
Ensure tze digest is only included if TZEs are in the consensus rules.
2021-06-08 11:33:52 -06:00
acc19a76e2
Bring in ZIP 244 auth digest test vectors.
...
From https://github.com/zcash-hackworks/zcash-test-vectors/pull/34 .
2021-06-08 18:17:30 +01:00
7e23b96a03
Extract ZIP 225 Orchard bundle parsing and serialization into helpers
...
These will be used by `zcashd` for handling the Orchard component of v5
transactions.
2021-06-08 17:29:04 +01:00
0bfd1f7544
Merge pull request #375 from nuttycom/feature/zip-225
...
ZIP 225 & ZIP 244
2021-06-08 17:28:25 +01:00
eb3d01aa6b
Apply suggestions from code review
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2021-06-08 07:02:52 -06:00
f70285d243
Fix error in transaction auth digest.
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-07 09:27:05 -06:00
371f84dc9b
Minor error message improvement.
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-07 09:27:05 -06:00
0253442af0
Be more explicit about empty sapling & orchard hashes.
2021-06-07 09:27:05 -06:00
2f3e4989ba
Merge pull request #352 from str4d/zcash_address
...
New component: zcash_address crate
2021-06-07 00:36:48 +01:00
e2fb5e6402
Impl ZIP 216 on SaplingVerificationContext and redjubjub::PublicKey
...
`PublicKey::verify` now always uses post-ZIP 216 validation rules, which
is fine in non-consensus contexts.
`SaplingVerificationContext` is used by `zcashd`'s consensus rules.
2021-06-06 23:45:15 +01:00
b93c503263
Deserialize signatures directly into actions.
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-05 10:19:36 -06:00
4f764c3c80
Use Vector read/write operations where possible instead of Array
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-05 10:12:39 -06:00
97bef30582
Remove consensus branch id from roundtrip serialization check.
...
Possible now that it's part of the transaction.
2021-06-05 09:48:52 -06:00
47ce97c3d2
Keep builder spend data in spend_auth_sig fields.
2021-06-05 09:45:55 -06:00
69e5a491ff
Fix generation of arbitrary jubjub points.
2021-06-04 17:28:44 -06:00
d0a911cb87
Fix rustdocs
2021-06-04 16:38:01 -06:00
28d3f481cd
Apply suggestions from code review.
2021-06-04 16:38:01 -06:00
e71a1ce345
Rename Vector::write_items -> Array::write and Vector::read_count -> Array::read
2021-06-04 16:38:01 -06:00
4623f98d9a
Fix bugs in construction of Sapling txid hashes.
2021-06-04 16:38:01 -06:00
df0095ebba
Add ZIP-244 test vectors.
2021-06-04 15:45:39 -06:00
6348400cf4
Store patial authorizing data for sapling components in bundle authorization.
2021-06-04 15:45:39 -06:00
6635895e55
Clean up TZE signature generation.
2021-06-04 15:45:39 -06:00
ab1b31ebf6
Store partial authorizing data for transparent txs in transparent authorization.
2021-06-04 15:45:39 -06:00
dac68ce2aa
Drop proptest space size to reduce test runtime.
2021-06-04 15:45:39 -06:00
38b864c100
Implement V5 transaction serialization & roundtrip property tests.
2021-06-04 15:45:39 -06:00
e828dbf5d0
Add v5 parsing and serialization for Sapling components.
2021-06-04 15:45:39 -06:00
1a5aad723b
Use generalized signature_hash for transaction builder.
2021-06-04 15:45:39 -06:00
55d1090f70
Add v5 txid & signature hashing.
2021-06-04 15:45:39 -06:00
1138343c89
Add data structures for transaction digests.
2021-06-04 15:45:39 -06:00
fd1790fec2
Move sighash.rs -> sighash_v4.rs
2021-06-04 15:45:39 -06:00
4bcad97ba1
Add amount conversion for Orchard values.
2021-06-04 15:45:39 -06:00
2ae55b4145
Add more flexibility to vector serialization.
2021-06-04 15:45:39 -06:00
9149d48afc
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-03 20:25:10 -06:00
231aa5d01a
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-03 18:47:49 -06:00
cc9dbf8bde
Fix clippy complaint.
2021-06-03 18:46:38 -06:00
a305760bb1
Move TZE components to a bundle within TransactionData
2021-06-03 18:46:38 -06:00
523424e50b
Move Transparent components to a bundle within TransactionData
2021-06-03 18:46:38 -06:00
670d03e74f
Move Sprout components to a bundle within TransactionData
2021-06-03 18:46:38 -06:00
84e8952ec3
Move Sapling components to a bundle within TransactionData
2021-06-03 18:46:38 -06:00
488d02aad3
Add Orchard bundle to TransactionData
...
This also adds parsing and serialization for Orchard bundle parts.
This requires changes to the TZE builder components, because they
refer to the TransactionData type in the context for witness creation.
2021-06-03 13:03:29 -06:00
12d2dfd1bd
Merge pull request #386 from nuttycom/feature/zip-225-builder_modularization
...
ZIP-225/244 #2 : Refactor transaction builder to create separate builders for each section.
2021-06-02 21:29:19 -06:00
2098196440
Fix errors caused by use of zero heights.
2021-06-02 21:07:29 -06:00
2b96e2eb0c
Fix TZE demo test errors.
2021-06-02 18:23:25 -06:00
e32e2d6e7f
Fix ordering of Sapling build errors.
2021-06-02 17:15:35 -06:00
0743f9e815
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-02 17:11:04 -06:00
2c891a8000
Fix incorrect progress notifier.
2021-06-02 17:09:17 -06:00
14d07cd826
Fix intra-doc links & rustfmt.
2021-06-02 17:09:17 -06:00
b487a7f820
Sapling builder can store network params.
2021-06-02 16:57:27 -06:00
4878b5b19b
Address comments from review.
2021-06-02 16:48:55 -06:00
72ac97a35f
Derive transaction version & branch id from target height.
2021-06-02 13:45:29 -06:00
7466ef42d8
Move change_address back to the main builder
...
Also, store the target height in the sapling builder.
2021-06-02 12:35:18 -06:00
c872f39547
Restore progresscounter.
2021-06-02 11:48:46 -06:00
3770e5de8b
Move TZE transaction builder to an independent module.
2021-06-02 11:48:46 -06:00
c1a8de27f3
Move Sapling transaction builder to an independent module.
2021-06-02 11:48:46 -06:00
ba6fc053b5
Move transparent transaction builder to an independent module.
2021-06-02 11:48:46 -06:00
8267d06846
Refactor transaction builder to create separate builders for each section.
2021-06-02 11:48:46 -06:00
f7f5cd472b
Merge branch 'master' into note-decryption-fixes
2021-06-02 18:45:01 +01:00
168314cec6
Update changelog.
2021-06-01 07:05:01 -06:00
62bd06f14e
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-06-01 07:03:31 -06:00
76999eb5c7
Make txid contents private & use txid for TzeOutPoint
2021-06-01 07:03:31 -06:00
936b552de2
Add NoteValue newtype, Nullifier::as_ref and proptest generation.
2021-06-01 07:03:31 -06:00
3dc05a69eb
Add Nu5 NetworkUpgrade variant.
2021-06-01 07:03:31 -06:00
4efb21d1c7
Make amount addition and subtraction traits use checked operations.
2021-06-01 07:03:31 -06:00
362838c3fa
zcash_note_encryption: Fix array size in Domain::extract_{esk, pk_d}
...
Decrypted output size is `OUT_PLAINTEXT_BYTES`, which the decryptor
can always provide (either by decrypting into the correct size array
as now, or truncating the buffer before passing it to the domain).
2021-05-28 23:48:03 +01:00
f6705f23c3
zcash_note_encryption: Add ovk recovery API
2021-05-28 23:45:23 +01:00
ae43e6c074
zcash_note_encryption: Pass cmstar_bytes to Domain::derive_ock
...
PRF^ock in the spec takes cm* as a byte array.
2021-05-28 23:41:13 +01:00
d031dabcfc
Builder: Move progress notifier configuration to a builder method
...
This is what builder methods are for :) and it helps to limit the growth
of alternate `build` methods.
2021-05-26 21:58:08 +01:00
d9a3b98120
Merge pull request #377 from adityapk00/builder_progress
...
Report Sapling Tx Builder Progress
2021-05-26 21:52:38 +01:00
6717cd821c
Move F4Jumble implementation into zcash_address
2021-05-20 22:50:59 +01:00
35dadc7f6c
f4jumble: Test both directions against test vectors
2021-05-20 14:16:39 +01:00
1dcba34167
Add checks against f4jumble test vectors.
2021-05-19 08:50:50 -06:00
774d166fff
Use VALID_LENGTH constant for f4jumble proptest generation.
2021-05-19 08:29:10 -06:00
4346ca9e50
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-05-19 08:29:10 -06:00
69ce777dd1
Use macros for personalization & iterator for g function.
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-05-19 08:29:01 -06:00
08a3fb9639
Implement F4Jumble
2021-05-19 08:28:58 -06:00
1b0f2060dd
Improve documentation of builder::Progress
2021-05-18 13:45:48 +01:00
f3aded9c84
Send builder progress
2021-05-17 09:44:42 -07:00
da431a0eb2
rustfmt fix
2021-05-03 14:08:06 +01:00
618a6165c7
Replace redundant code with call to Field::random() which does the same as the code.
2021-05-03 13:34:13 +02:00
8828276361
Query for unspent utxos checks to ensure that spending tx is mined.
...
Also make it an error to try to send a memo to a transparent address.
2021-04-16 14:26:51 -06:00
28a45028ab
cargo fmt
2021-04-16 14:03:55 +12:00
3434cc8b6a
Add a note about canonicity of ephemeral public keys.
2021-04-15 15:32:45 -06:00
b2b3efd4c2
Fix naming cmstar -> cmstar_bytes and cm -> cmstar
2021-04-15 15:24:45 -06:00
00d04de547
Make cmstar check follow the spec more closely.
2021-04-14 15:38:58 -06:00
12cb8265d8
Fix formatting.
2021-04-12 18:47:45 -06:00
fae1a1517a
Simplify try_sapling_output_recovery.
2021-04-12 18:40:17 -06:00
6fc1d1d1c0
Use ephemeral_key bytes instead of the epk abstract point where specified.
2021-04-12 16:19:50 -06:00
324fc36521
Use ShieldedOutput trait for note encryption/decryption.
...
This change modifies note encryption and decryption functions
to treat a shielded output as a single value instead of handling
the parts of an output as independent arguments.
2021-04-12 12:59:06 -06:00
a560101bb2
Remove spurious mut references.
2021-04-08 10:08:00 -06:00
879eea863a
Apply suggestions from code review
...
Co-authored-by: str4d <jack@electriccoin.co>
2021-04-08 08:20:23 -06:00
213cd6cce9
Fix Clippy complaints.
2021-04-08 08:20:23 -06:00
5b13bb3a1e
Add try_output_recovery_with_ovk to shared note encryption code.
2021-04-08 08:20:23 -06:00
266285b536
Move generalized note encryption functionality to zcash_note_encryption crate.
2021-04-08 08:20:21 -06:00
e77839232d
Generalize note encryption and decryption.
...
This commit introduces a `Domain` trait which defines the types
and operations that are shared between Sapling and Orchard note
encryption and decryption processes.
2021-04-08 08:19:10 -06:00
5baccdf052
Move note_encryption into the sapling module.
2021-04-08 08:19:10 -06:00
2f3847638d
zcash_primitives: Revert to SproutProof::PHGR
...
Unlike regular acronyms or abbreviations, this is author initials, which
we've decided to keep capitalised.
2021-04-02 10:39:25 +13:00
63db2729e9
Temporarily allow clippy::result_unit_err lint
...
Fixing these lints is deferred to zcash/librustzcash#367 .
2021-03-27 19:01:03 +13:00
56b577b31e
clippy: Fix small lints
2021-03-27 19:01:03 +13:00
564c2714fe
clippy: Use Iterator::try_for_each
2021-03-27 19:01:03 +13:00
636845d0f9
Renames to use lower-case abbreviations (matching Rust convention)
...
As of our MSRV bump to 1.51.0, we get lints for this.
2021-03-27 19:01:03 +13:00
8ac663f116
Fix some doctests and intra-doc links after moving Sapling primitives
2021-03-27 17:10:18 +13:00
33effb7d67
Move sapling keys into sapling module.
2021-03-27 16:18:21 +13:00
4086df772c
Move sapling-specific primitives into the sapling module.
2021-03-27 16:18:21 +13:00
abbf5dfd83
Move pedersen hash test vectors into Sapling
2021-03-27 16:18:21 +13:00
bc087a5ff7
Move pedersen hashes to sapling module.
2021-03-27 16:18:21 +13:00
88d58aac0a
Move relevant utils into sapling module.
2021-03-27 16:18:21 +13:00
16948d9d78
Move zcash_primitives::prover to sapling module
2021-03-27 16:18:21 +13:00
bf97b21632
Move redjubjub to sapling module.
2021-03-27 16:18:21 +13:00
de1345a1c2
Move group_hash to sapling module.
2021-03-27 16:18:21 +13:00
c839193b20
Move TZE components to a separate module & add TzeOutPoint
2021-03-27 15:52:20 +13:00
97f2502a5e
Factor transparent transaction components into a separate module.
2021-03-27 15:49:17 +13:00
96709c6423
Move Sapling transaction components to a separate module.
2021-03-27 15:49:17 +13:00
7fcb7bbe99
Factor Sprout transaction elements into a separate module.
2021-03-27 15:49:17 +13:00
6e371a8c13
Make Sprout elements crate-public.
2021-03-27 15:49:17 +13:00
9d9c0579f8
Use new name for broken_intra_doc_links lint
...
We also add the lint to crates in the workspace that didn't have it.
Closes zcash/librustzcash#279 .
2021-03-27 08:27:17 +13:00
675048e52b
Fix broken intra-doc links and lints
2021-03-26 10:07:20 +13:00
55e73d7910
Fix clippy lints
2021-03-26 10:07:20 +13:00
8a84203685
Remove Default impl from MemoBytes
...
Memo fields have two ways to encode an empty memo:
- 0xF6 followed by all-zeroes, encoding "there is no memo".
- All-zeroes, encoding the empty UTF-8 string.
In almost all cases you want the former, but users thinking about byte
slices may expect MemoBytes::default() to result in the latter. To
ensure clarity, we now require calling either MemoBytes::default() or
MemoBytes::from_bytes(&[]) to be explicit.
No such confusion exists for the Memo enum, because the two types are
visibly separated as different enum cases, and Memo::Empty makes sense
as the default.
2021-03-17 21:16:01 +13:00
c7a3ef0e88
Split memo-handling into MemoBytes struct and Memo enum
...
The MemoBytes struct is a minimal wrapper around the memo bytes, and only
imposes the existence of null-padding for shorter memos. The only error
case is attempting to construct a memo that is too long. MemoBytes is
guaranteed to be round-trip encodable (modulo null padding).
The Memo enum implements the additional memo rules defined in ZIP 302,
interpreting the contents of a memo (for example, parsing it as text).
2021-03-17 21:05:50 +13:00
48f7ef84a4
Move Memo into zcash_primitives::memo
2021-03-17 19:58:40 +13:00
b5bbbb6f5a
Factor out nullifier update from database actions in scan_cached_blocks
2021-03-09 20:59:57 -07:00
463e252af4
Fix more intra-doc links
2021-03-04 23:01:42 +00:00
d221b230c6
Fix intra-doc links
2021-03-04 17:41:08 +00:00
36e4b0d51a
Merge pull request #329 from nuttycom/ivk_payment_addresses
...
Introduce SaplingIvk newtype & use IVKs where possible.
2021-03-04 07:04:05 +13:00
b37b5876f2
Merge pull request #318 from nuttycom/tx_version_enum
...
Add TxVersion enum to make interacting with transaction version values safer.
2021-02-04 12:47:12 -07:00
974669a50b
Fix clippy lints.
2021-02-04 11:41:29 -07:00
796161e9b4
Add suggested comment clarifying future additions to the TxVersion enum
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2021-02-04 11:22:13 -07:00
1cc7949518
Rename CommitmentTree::new -> CommitmentTree::empty
2021-02-04 07:49:48 -07:00
3423b03c6d
Fix a couple more lints.
2021-02-04 07:31:00 -07:00
98530184c0
Fix clippy complaints.
2021-02-03 14:27:31 -07:00
7a57aee530
Introduce SaplingIvk newtype & use IVKs where possible.
...
This includes making it possible to obtain a payment address from just the IVK + diversifier.
2021-02-02 15:27:13 -07:00
45f3f5a945
Simplify a few pattern matches
...
A few pattern-matches correspond directly to standard combinators on
`Result`, `Option`. This uses them for concision / clarity.
Refactorings reviewed by the author after suggestion from [comby-rust](https://github.com/huitseeker/comby-rust ).
2021-02-01 13:37:54 -05:00
937fa06136
Fix randomized tests of zfuture transaction roundtrip.
2021-01-25 16:32:57 -07:00
6373e7d053
Raise an error in the case that sprout version < 1.
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2021-01-25 16:32:57 -07:00
1dd5a6dbcb
Check all transaction versions in has_sprout and uses_groth_proof checks.
2021-01-25 16:32:57 -07:00
06cd91059f
Enable transaction serialization roundtrip tests outsize zfuture.
2021-01-25 16:32:57 -07:00
da4cf23668
Add TxVersion enum to make interacting with transaction version values safer.
...
Co-authored-by: str4d <thestr4d@gmail.com>
2021-01-25 16:32:57 -07:00
6315f7dc28
Use wNAF multiplication for Sapling key agreement.
2021-01-22 15:16:06 -07:00
8e8ed2bb4f
Rename get_verified_balance -> get_balance_at
2021-01-15 12:00:14 -07:00
c70a9ed81f
Apply suggestions from code review
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
Co-authored-by: str4d <thestr4d@gmail.com>
2021-01-15 11:57:58 -07:00
ce06db197a
Rustfmt.
2021-01-12 21:10:34 -07:00
db9eb29eba
Merge remote-tracking branch 'upstream/master' into data_access_api
2021-01-12 21:09:40 -07:00
7acc75249b
Fix documentation of human-readable prefixes.
2021-01-12 20:45:28 -07:00
7d92150965
Fix test compilation with WalletWrite changes.
2021-01-11 18:13:40 -07:00
aad2e174c1
Consistently use nullifier and AccountId newtypes.
2021-01-08 21:49:38 -07:00
27d7b6c569
A few doc updates.
2021-01-08 18:08:02 -07:00
472dac7a22
Revert intra_doc_link_resolution_failure flag change.
2020-12-17 07:36:18 -07:00
cf0c3ea90f
Relax RngCore type constraints.
...
The intent of this change is to permit tests to use deterministic
random sources, rather than cryptographically strong ones.
2020-12-14 13:44:05 -07:00
c24f663e40
Use methods on sigversion to gate ZIP-243 and TZE signature parts.
2020-12-14 14:54:29 +00:00
790071953c
Use rust feature flagging to allow conditionally enabling TZE-related code.
...
This also uses the test-dependencies feature flag for conditional
inclusion of proptest-related modules which may be used by
dependent crates for generation of samples in testing.
2020-12-14 14:54:12 +00:00
62675f4b4f
Use the SHA-256d HashReader and HashWriter for transaction hashing.
...
This hashes the transaction as it is read, rather than hashing a re-serialization.
Co-authored-by: Jack Grigg <str4d@electriccoin.co>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-12-03 21:22:58 +00:00
1f18da239f
Add HashReader and HashWriter for SHA-256d.
...
Co-authored-by: Jack Grigg <str4d@electriccoin.co>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-12-03 21:22:58 +00:00
cf2dae8af0
Add hrp_sapling_extended_spending_key to Parameters trait.
2020-12-02 09:46:17 -07:00
ee0e059eb3
Add coin_type to consensus parameters.
2020-12-02 09:46:17 -07:00
a437df191e
Initial skeleton of low-level database access API.
2020-12-02 09:46:17 -07:00
1285ab0af2
Fix tests to account for modified default fees.
2020-11-24 01:24:19 +00:00
53ebc378cc
ZIP-313 change default fee amount.
2020-11-24 01:22:14 +00:00
f40174464a
Use slices as parameters rather than &Vec references.
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-11-19 14:49:24 -07:00
726f02513d
Make the functions which produce the components of the sighash reusable.
...
When implementing transaction nonmalleability, it will be useful
to have this already done.
2020-11-19 11:25:24 -07:00
be8bae71be
Suppress clippy lints where we want the given behaviour
2020-10-30 14:10:35 +00:00
91796adcda
Remove wrapping closures around mapping functions
2020-10-30 14:10:35 +00:00
025deda712
impl Default for T on types with T::new()
2020-10-30 14:10:35 +00:00
44cbc6cc6d
Remove unnecessary references
2020-10-30 14:10:35 +00:00
88474c71c7
Simplify expressions
2020-10-30 13:51:40 +00:00
0cb51f963c
Remove unnecessary clones
2020-10-30 13:51:40 +00:00
bc9ca20d56
Make use of assignment operators
2020-10-30 13:26:36 +00:00
890648df4d
Use !x.is_empty() instead of x.len() > 0
2020-10-30 13:25:08 +00:00
0bbcd8c408
Remove unnecessary imports
2020-10-30 13:22:46 +00:00
70ecd6b2d8
Export notesize constants
2020-10-26 11:31:22 -07:00
d657ff906e
zcash_primitives: Small simplification to Script::address
2020-10-18 13:17:16 +01:00
b1c3f9d3f0
ZIP 321 Reference Implementation ( #294 )
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
Co-authored-by: Jack Grigg <jack@electriccoin.co>
2020-10-15 14:03:40 +01:00
eeb0c2b08a
Update comment in zcash_primitives/src/transaction/builder.rs
2020-10-13 14:28:54 -06:00
536c77bea7
Fix formatting.
2020-10-13 07:12:33 -06:00
cc121ede8e
Document `TzeIn` serialization.
2020-10-09 16:37:00 -06:00
39ab6e5b95
Apply suggestions from code review
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-10-09 16:19:44 -06:00
26aa23988c
Replace domain separator with a 1-byte tag.
2020-09-30 10:22:51 -06:00
03b4e56a44
Formatting fix.
2020-09-23 17:14:35 -06:00
b6cd096c10
Generate plausible scripts for transaction proptests.
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-09-23 14:48:10 -06:00
9963fb9e57
Use CompactSize & Vector::write for tze sighash construction.
2020-09-23 14:37:48 -06:00
995d063992
Documentation fixes from code review.
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-09-23 14:16:29 -06:00
6a536aa88a
Use more informative type names in Extension trait.
2020-09-23 13:35:14 -06:00
36c28341b3
Additional future -> zfuture renaming.
2020-09-23 13:11:47 -06:00
99eb5b9336
Rename `Future -> ZFuture`
...
Proactively distinguish against future use of the
futures crate for source greppability.
2020-09-22 10:17:58 -06:00
a0a36eddfd
Merge remote-tracking branch 'upstream/master' into zip-tzes
...
Fix benchmark build issues.
2020-09-21 16:43:33 -06:00
ab2d5bf603
Merge remote-tracking branch 'upstream/master' into zip-tzes
2020-09-21 10:08:05 -06:00
e0587e752b
Merge pull request #290 from str4d/273-remove-decryption-epk-subgroup-check
...
Take epk as a jubjub::ExtendedPoint for note decryption
2020-09-22 03:05:35 +12:00
924ee09bc4
Add documentation to primary `Extension` trait
2020-09-18 11:21:44 -06:00
cfb6850d7c
Rustfmt
2020-09-18 10:52:58 -06:00
80e1d35ea6
Apply additional suggestions from code review.
2020-09-18 10:40:30 -06:00
90d8980162
Apply suggestions from code review
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-09-18 10:39:37 -06:00
d232133216
Add constants to support static resolution of network parameters.
2020-09-17 12:58:23 -06:00
1ad9294933
Remove static determination of network state.
...
In the interest of making the library usable for both
testnet and mainnet without recompilation, static resolution
of network parameters has been replaced with a parameter passed
to the relevant functions. This also moves addres prefix constants
into the network parameters.
2020-09-17 10:34:42 -06:00
efaba87681
Add newtype for block height.
2020-09-17 10:26:41 -06:00
c35c501734
Add comment on FUTURE_TX_VERSION/GROUP_ID`
2020-09-10 14:52:47 -06:00
208208238d
Add property test for round-trip serialization of TZE-bearing transactions.
2020-09-10 14:52:47 -06:00
a5d5f87b48
Bind TZE inputs and outputs in signature.
2020-09-10 14:52:47 -06:00
eb4a2d5032
Add domain separator to transparent signatures.
...
Once TZEs are active, we would like to ensure that collisions
between TZE input signatures and transparent input signatures
cannot occur, so we add a domain separator to both.
This also ensures that if TZE inputs are presented for signature
without using the `Future` sighash version, that the signing
code will report an error.
2020-09-10 14:52:47 -06:00
5a432b5e2b
Ensure that prevout, extension_id & mode data can be signed in builder.
2020-09-10 14:52:47 -06:00
1a8168e1c9
Document transaction builder methods.
2020-09-10 14:52:47 -06:00
671caa8b84
Remove unused Epoch trait.
2020-09-10 14:52:47 -06:00
23634d4cd0
Document ExtensionTxBuilder methods
2020-09-10 14:52:47 -06:00
9d2f388b3b
Apply idiomatic rustlang suggestions from code review
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-09-10 14:52:47 -06:00
9ef15b536c
Update method documentation in zcash_primitives/src/extensions/transparent.rs
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-09-10 14:52:47 -06:00
b15e49ef47
Documentation update to zcash_primitives/src/extensions/transparent.rs
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-09-10 14:52:47 -06:00
af931d524a
Demo TZE fixes in response to PR comments.
2020-09-10 14:52:47 -06:00
aed2759e1e
Use NetworkUpgrade for TZE epoch determination.
...
This adds a `Future` variant for both BranchId and NetworkUpgrade.
2020-09-10 14:52:47 -06:00
81b6f8afd7
Formatter fix.
2020-09-10 14:52:47 -06:00
8299f336d3
Add test for tze txn parsing.
2020-09-10 11:58:40 -06:00
dc9b007e8e
Add signature hash over TZE data.
2020-09-10 11:58:40 -06:00
294aa86195
Change extension_id and mode types to u32
2020-09-10 11:58:40 -06:00
4edbd26d7f
Keep transaction details private.
2020-09-10 11:58:40 -06:00
fe6bea1fce
Check transparent input for correctness before modifying vin.
2020-09-10 11:58:40 -06:00
4a954c7f8f
Add tests for transaction builder support.
2020-09-10 11:58:40 -06:00
ca8e24eef5
Add validation to demo transaction builder.
2020-09-10 11:58:40 -06:00
659c34a954
Make error a type member of FromPayload trait rather than a type variable.
...
Fix demo test compilation errors.
2020-09-10 11:58:40 -06:00
961d251178
Add transaction-builder suport for TZE-bearing transactions.
2020-09-10 11:58:40 -06:00
bf7f95b0e9
TZE consensus context and program sets
...
Co-authored-by: Kris Nuttycombe <kris.nuttycombe@gmail.com>
2020-09-10 11:58:40 -06:00
ce9a695ded
Demo TZE parsing and consensus logic
2020-09-10 11:58:40 -06:00
b3332db3e9
Add TZEs to transaction format
2020-09-10 11:58:40 -06:00
192db29a25
Take epk as a jubjub::ExtendedPoint for note decryption
...
We don't need to check if epk is in the prime-order subgroup before we
trial-decrypt, which saves a third of the cost of trial-decrypting
outputs that are not ours.
2020-09-10 00:39:21 +01:00
c7e9523dce
Merge pull request #284 from str4d/259-ovk-none
...
zcash_primitives: Support ovk = ⊥ in note encryption
2020-09-09 14:32:57 -06:00
96bd59b942
Migrate to ff 0.8 and bellman 0.8
...
bellman 0.8 includes fixes for several performance regressions.
MSRV is now 1.44.0, matching the ff crate.
2020-09-09 00:27:51 +01:00
40e135783c
zcash_primitives: Support ovk = ⊥ in note encryption
...
Closes zcash/librustzcash#259 .
2020-08-28 21:17:16 +01:00
72817b0edc
zcash_primitives: Add OutgoingCipherKey struct
2020-08-28 16:17:15 +01:00
bdb42bcbc8
pairing 0.17.0
2020-08-23 15:31:09 +01:00
a3cb89dff9
zcash_primitives: Add feature flags to docs.rs documentation
2020-08-23 06:56:03 +01:00
cfed47c176
Rename ValueCommitment.cm() to .commitment() (because it's confusing to have cm referring to both note and value commitments).
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-08-22 01:28:13 +01:00
20c5096793
Fix remaining cases of cm -> cmu.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-08-22 01:28:13 +01:00
ee6c21f95b
Scripted diff:
...
```
find . -not -path '*/.git/*' -a -type f -exec sed -i -e 's/hash_x/hash_u/g' {} \;
find . -not -path '*/.git/*' -a -type f -exec sed -i -e 's/hash_y/hash_v/g' {} \;
```
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-08-22 01:28:13 +01:00
d15acf8acc
zcash_primitives: Rename Note::cm to Note::cmu
2020-08-21 18:35:04 +01:00
7a6223202e
zcash_primitives: Remove redundant TODO
...
The primitives are no longer generic over a curve; we hard-code Jubjub,
so we know that the smallest u-coordinate that is not on the curve is 1.
2020-08-21 18:27:09 +01:00
ca5bc6b0ae
zcash_primitives: Fix names of some test vector macros
2020-08-21 18:25:30 +01:00
ed3489a111
zcash_primitives: Explicitly type zero-initialised arrays
2020-08-21 18:22:29 +01:00
b9a8e1e415
zcash_primitives: Remove Jubjub implementation
...
We now use the jubjub crate for this.
2020-08-19 23:08:19 +01:00
fdf06032e3
s/{pairing::bls12_381, zcash_primitives::jubjub}/{bls12_381, jubjub}
...
FINALLY.
2020-08-19 23:08:19 +01:00
10c571f2cd
zcash_primitives: Define generator constants using new crates
...
Includes tests to ensure that the new generator constants match the
current zcash_primitives::JUBJUB generators.
2020-08-19 23:08:19 +01:00
b86558c63a
Decrypt sapling output description given OCK ( #271 )
...
* decrypt sapling outputs directly with ock
* make prf_ock public
* unit tests for ock sapling output decryption
2020-08-19 06:38:09 +12:00
72cc8fc916
Minor refactor of enumeration in tests in note_encryption.rs
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-08-07 08:46:15 +08:00
13f4d0844e
Avoid using unwrap() when calling derive_esk()
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-08-07 00:12:07 +08:00
d54fd09c5f
Add esk check in parse_note_plaintext_without_memo() and try_sapling_output_recovery()
2020-08-06 18:39:49 +08:00
5480a376df
Extract derive_esk() into separate function
2020-08-06 18:21:27 +08:00
7cee29bbcc
Use <P: consensus::Parameters> type for Builder impl
2020-08-06 18:12:15 +08:00
0f8f1b3f5d
Fix parsing of rseed in parse_note_plaintext_without_memo() and try_sapling_output_recovery()
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-08-06 18:12:15 +08:00
40a908e0a8
Refactor leadbyte_array in note_encryption tests
...
Co-authored-by: str4d <thestr4d@gmail.com>
2020-08-06 18:12:10 +08:00
8968547981
Document pub enum Rseed<Fs> with link to ZIP 212
2020-08-06 13:13:49 +08:00
878646855c
Switch on leadbyte instead of tx height when decrypting outputs
2020-08-06 12:57:48 +08:00
c3d89644e2
Revert SaplingNoteEncryption::new() API to take rng instead of esk
2020-08-06 12:47:35 +08:00
4f22077cf6
Remove const activation heights from consensus.rs
2020-08-06 12:30:48 +08:00
9970a8aefd
Hard-code NetworkUpgrade::Canopy in generate_random_rseed
2020-08-06 12:27:20 +08:00
44f46e50ce
Add <P: consensus::Parameters> type parameter to Builder struct
2020-08-06 11:43:07 +08:00
88072d64ec
Remove network cfg from zcash_client_backend and zcash_primitives
2020-08-06 11:35:05 +08:00
c8fcdeb50b
Minor changes in note_encryption.rs
2020-08-05 15:45:18 +08:00
2ed9b6f881
Refactor contextual random rseed generation into util method in zcash_primitives
2020-08-05 15:21:42 +08:00
a3ae1b273d
Switch plaintext version on height for dummy outputs in Builder
2020-08-05 14:27:36 +08:00
a25348dfba
Revert passing Parameters to methods
2020-08-05 12:47:29 +08:00
0a47a9dbea
Pass rseed to Prover
2020-08-04 16:40:53 +08:00
b34e8b903c
Add invalid version byte tests for ZIP212
2020-08-03 13:51:45 +08:00
eba542c95f
Add activation heights as consts in consensus::Parameters
2020-08-03 13:40:39 +08:00
b1ddd556af
Check derived esk against claimed epk when decrypting note
2020-07-31 22:40:52 +08:00
895e251793
Fix tests
2020-07-31 22:40:48 +08:00
6904c8f933
Implement plaintext_version_is_valid()
2020-07-31 22:28:51 +08:00
eda00ec7ad
Pass esk to SaplingNoteEncryption::new and add generate_or_derive_esk()
2020-07-31 22:28:50 +08:00
65504d9ca7
Add enum Rseed<E::Fs> to Note struct
2020-07-31 22:28:40 +08:00
b537f0f712
Pass height to methods which encrypt or decrypt Sapling outputs
2020-07-31 12:39:39 +08:00
71d31abad6
Set activation heights for Canopy
2020-07-30 12:52:02 +08:00
f55f094ef6
Merge pull request #248 from str4d/equihash-crate
...
Move Equihash verifier into equihash crate
2020-07-10 11:57:11 +12:00
d380a8c8d2
Merge pull request #246 from str4d/zcash_client_sqlite
...
zcash_client_sqlite crate
2020-07-10 10:22:37 +12:00
5b2c71e112
Move Equihash verification APIs into equihash crate
2020-06-26 13:01:04 +12:00
34725df086
zcash_client_sqlite::transact::create_to_address()
2020-06-25 18:54:41 +12:00
Kris Nuttycombe
Kris Nuttycombe
therealyingtong
Jack Grigg
Daira Hopwood
Kris Nuttycombe
str4d
Aditya Kulkarni
narodnik
Jack Grigg
François Garillot
Sean Bowe
Kevin Gorham
Matthew Fors
therealyingtong