-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rust: Migrate to latest revision of zcash/librustzcash
crates
#6784
Conversation
62e3cb0
to
1f1cd8e
Compare
1f1cd8e
to
9734142
Compare
9734142
to
ea61a78
Compare
223ecfd
to
3002a92
Compare
3002a92
to
683e038
Compare
c153b42
to
b0ac5c3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As part of this PR we probably should also modify contrib/debian/copyright
to change orchard's license away from BOSL, remove the license exception in deny.toml
, and remove the mention of BOSL in the COPYING
file since it's no longer relevant. (Are there other remnants of BOSL in our codebase after this?)
Nevermind, we'll merge those changes separately in #6800 after this lands.
0xc1, 0xdb, 0xb1, 0x0c, 0xc4, 0xfb, 0x15, 0xab, 0x02, 0xac, 0xae, 0xf9, 0x44, 0xdd, | ||
0xab, 0x8b, 0x67, 0x22, 0x54, 0x5f, 0xda, 0x4c, 0x62, 0x04, 0x6d, 0x69, 0xd9, 0x8f, | ||
0x92, 0x2f, 0x4e, 0x8c, 0x21, 0x0b, 0xc4, 0x7b, 0x4f, 0xdd, 0xe0, 0xa1, 0x94, 0x71, | ||
0x79, 0x80, 0x4c, 0x1a, 0xce, 0x56, 0x90, 0x05, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why have these test vectors changed?
@@ -150,7 +149,8 @@ pub struct Wallet { | |||
nullifiers: BTreeMap<Nullifier, OutPoint>, | |||
/// The incremental Merkle tree used to track note commitments and witnesses for notes | |||
/// belonging to the wallet. | |||
commitment_tree: BridgeTree<MerkleHashOrchard, u32, NOTE_COMMITMENT_TREE_DEPTH>, | |||
// TODO: Replace this with an `orchard` crate constant (they happen to be the same). | |||
commitment_tree: BridgeTree<MerkleHashOrchard, u32, { sapling::NOTE_COMMITMENT_TREE_DEPTH }>, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
commitment_tree: BridgeTree<MerkleHashOrchard, u32, { sapling::NOTE_COMMITMENT_TREE_DEPTH }>, | |
commitment_tree: BridgeTree<MerkleHashOrchard, u32, 32>, |
Temporarily, it is better to hard-code than to use another constant that happens to be the same (also change the comment and specify the type of the constant if necessary).
frontier: *const bridgetree::Frontier<MerkleHashOrchard, NOTE_COMMITMENT_TREE_DEPTH>, | ||
frontier: *const bridgetree::Frontier< | ||
MerkleHashOrchard, | ||
{ sapling::NOTE_COMMITMENT_TREE_DEPTH }, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here.
@@ -306,9 +306,10 @@ class TxWithNullifiers | |||
|
|||
// The Orchard bundle builder always pads to two Actions, so we can just | |||
// use an empty builder to create a dummy Orchard bundle. | |||
// TODO: With the new BundleType::DEFAULT this is no longer true. Fix this. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please file an issue.
@@ -2046,21 +2049,21 @@ TEST(WalletTests, UpdatedSaplingNoteData) { | |||
auto m = GetTestMasterSaplingSpendingKey(); | |||
|
|||
// Generate dummy Sapling address | |||
auto sk = m.Derive(0); | |||
auto sk = m.Derive(0 | HARDENED_KEY_LIMIT); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This constant only happens to have the right value. (Same comment on other instances.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK with comments.
b0ac5c3
to
fd675c3
Compare
Rebased onto |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK the changes since the approving reviews
fixes #6566, fixes #6806