Zsa issuance

.cargo/config.offline

@@ -4,5 +4,15 @@ linker = "aarch64-linux-gnu-gcc"
 [source.crates-io]
 replace-with = "vendored-sources"
 
+[source."https://github.com/QED-it/librustzcash"]
+git = "https://github.com/QED-it/librustzcash"
+rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81"
+replace-with = "vendored-sources"
+
+[source."https://github.com/QED-it/orchard"]
+git = "https://github.com/QED-it/orchard"
+rev = "3518629964805c46598c7ccc4764ea6f42fbd5c5"
+replace-with = "vendored-sources"
+
 [source.vendored-sources]
 # The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

Cargo.toml

@@ -113,3 +113,12 @@ lto = true
 panic = 'abort'
 codegen-units = 1
 
+[patch.crates-io]
+orchard = { git = "https://github.com/QED-it/orchard", rev = "3518629964805c46598c7ccc4764ea6f42fbd5c5" } # branch = "ivk-to-bytes-visibility-downgrade"
+zcash_primitives = { git = "https://github.com/QED-it/librustzcash", rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81" } # branch = "zsa-bundle-in-v5-vector-serialization"
+equihash = { git = "https://github.com/QED-it/librustzcash", rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81" }
+zcash_address = { git = "https://github.com/QED-it/librustzcash", rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81" }
+zcash_encoding = { git = "https://github.com/QED-it/librustzcash", rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81" }
+zcash_note_encryption = { git = "https://github.com/QED-it/librustzcash", rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81" }
+zcash_proofs = { git = "https://github.com/QED-it/librustzcash", rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81" }
+zcash_history = { git = "https://github.com/QED-it/librustzcash", rev = "b35afbce395ada0c3d62373ffa12f7a7e4f82e81" }

qa/rpc-tests/issuance.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+# Copyright (c) 2022 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    NU5_BRANCH_ID,
+    assert_equal,
+    nuparams,
+    start_nodes,
+)
+
+class IssueTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+
+    def setup_nodes(self):
+        return start_nodes(self.num_nodes, self.options.tmpdir, [[
+            nuparams(NU5_BRANCH_ID, 205),
+            '-regtestwalletsetbestchaineveryblock'
+        ]] * self.num_nodes)
+
+    def run_test(self):
+        # Sanity-check the test harness
+        assert_equal(self.nodes[0].getblockcount(), 200)
+
+        # Get a new Orchard account on node 0
+        acct0 = self.nodes[0].z_getnewaccount()['account']
+        ua0 = self.nodes[0].z_getaddressforaccount(acct0, ['orchard'])['address']
+
+        # Activate NU5
+        self.nodes[0].generate(5)
+        self.sync_all()
+
+        # Send a transaction to node 1 so that it has an Orchard note to spend.
+        self.nodes[0].issue(0, ua0, "WBTC", 4001, True)
+
+        self.sync_all()
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        walletinfo = self.nodes[0].getwalletinfo()
+
+        print(walletinfo)
+
+        assert_equal(len(walletinfo['asset_balances'].items()), 1)
+        for key, value in walletinfo['asset_balances'].items():
+            assert_equal(value['confirmed_balance'], 4001)
+
+if __name__ == '__main__':
+    IssueTest().main()
+

qa/rpc-tests/test_framework/mininode.py

@@ -434,7 +434,7 @@ def deserialize(self, f):
         self.rk = deser_uint256(f)
         self.cmx = deser_uint256(f)
         self.ephemeralKey = deser_uint256(f)
-        self.encCiphertext = f.read(580)
+        self.encCiphertext = f.read(612)
         self.outCiphertext = f.read(80)
 
     def serialize(self):
@@ -524,6 +524,21 @@ def __repr__(self):
             )
 
 
+class IssueBundle(object):
+
+    def deserialize(self, f):
+        num_actions = struct.unpack("<B", f.read(1))[0]
+        if num_actions != 0:
+            raise Exception("Non-empty IssueBundle is not implemented in mininode")
+
+    def serialize(self):
+        r = b""
+        r += ser_compact_size(0)
+        return r
+
+    def __repr__(self):
+        return "IssueBundle(Empty)"
+
 class Groth16Proof(object):
     def __init__(self):
         self.data = None
@@ -628,7 +643,7 @@ def deserialize(self, f):
         self.cv = deser_uint256(f)
         self.cmu = deser_uint256(f)
         self.ephemeralKey = deser_uint256(f)
-        self.encCiphertext = f.read(580)
+        self.encCiphertext = f.read(612)
         self.outCiphertext = f.read(80)
 
     def serialize(self):
@@ -665,7 +680,7 @@ def deserialize(self, f):
         self.cv = deser_uint256(f)
         self.cmu = deser_uint256(f)
         self.ephemeralKey = deser_uint256(f)
-        self.encCiphertext = f.read(580)
+        self.encCiphertext = f.read(612)
         self.outCiphertext = f.read(80)
         self.zkproof = Groth16Proof()
         self.zkproof.deserialize(f)
@@ -981,6 +996,7 @@ def __init__(self, tx=None):
             self.valueBalance = 0
             self.saplingBundle = SaplingBundle()
             self.orchardBundle = OrchardBundle()
+            self.issueBundle = IssueBundle()
             self.shieldedSpends = []
             self.shieldedOutputs = []
             self.vJoinSplit = []
@@ -1000,6 +1016,7 @@ def __init__(self, tx=None):
             self.valueBalance = tx.valueBalance
             self.saplingBundle = copy.deepcopy(tx.saplingBundle)
             self.orchardBundle = copy.deepcopy(tx.orchardBundle)
+            self.issueBundle = copy.deepcopy(tx.issueBundle)
             self.shieldedSpends = copy.deepcopy(tx.shieldedSpends)
             self.shieldedOutputs = copy.deepcopy(tx.shieldedOutputs)
             self.vJoinSplit = copy.deepcopy(tx.vJoinSplit)
@@ -1044,6 +1061,10 @@ def deserialize(self, f):
             self.orchardBundle = OrchardBundle()
             self.orchardBundle.deserialize(f)
 
+            # Orchard transaction fields
+            self.issueBundle = IssueBundle()
+            self.issueBundle.deserialize(f)
+
             return
 
         self.vin = deser_vector(f, CTxIn)
@@ -1102,6 +1123,9 @@ def serialize(self):
             # Orchard transaction fields
             r += self.orchardBundle.serialize()
 
+            # Issuance transaction fields
+            r += self.issueBundle.serialize()
+
             return r
 
         r = b""

qa/rpc-tests/test_framework/zip244.py

@@ -155,6 +155,25 @@ def orchard_auth_digest(orchardBundle):
 
     return digest.digest()
 
+def issue_digest(tx):
+    digest = blake2b(digest_size=32, person=b'ZTxIdOrcZSAIssue')
+
+    # if tx.issueBundle is not None:
+    # Add all fields
+    # So far we only need digests for empty bundle here for pre-ZSA tests
+
+    return digest.digest()
+
+
+def issue_auth_digest(tx):
+    digest = blake2b(digest_size=32, person=b'ZTxIdOrcZSAIssue')
+
+    # if tx.issueBundle is not None:
+    # Add all fields
+    # So far we only need digests for empty bundle here for pre-ZSA tests
+
+    return digest.digest()
+
 # - Actions
 
 def orchard_actions_compact_digest(orchardBundle):
@@ -163,21 +182,21 @@ def orchard_actions_compact_digest(orchardBundle):
         digest.update(ser_uint256(desc.nullifier))
         digest.update(ser_uint256(desc.cmx))
         digest.update(ser_uint256(desc.ephemeralKey))
-        digest.update(desc.encCiphertext[:52])
+        digest.update(desc.encCiphertext[:84])
     return digest.digest()
 
 def orchard_actions_memos_digest(orchardBundle):
     digest = blake2b(digest_size=32, person=b'ZTxIdOrcActMHash')
     for desc in orchardBundle.actions:
-        digest.update(desc.encCiphertext[52:564])
+        digest.update(desc.encCiphertext[84:596])
     return digest.digest()
 
 def orchard_actions_noncompact_digest(orchardBundle):
     digest = blake2b(digest_size=32, person=b'ZTxIdOrcActNHash')
     for desc in orchardBundle.actions:
         digest.update(ser_uint256(desc.cv))
         digest.update(ser_uint256(desc.rk))
-        digest.update(desc.encCiphertext[564:])
+        digest.update(desc.encCiphertext[596:])
         digest.update(desc.outCiphertext)
     return digest.digest()
 
@@ -204,6 +223,7 @@ def txid_digest(tx):
     digest.update(transparent_digest(tx))
     digest.update(sapling_digest(tx.saplingBundle))
     digest.update(orchard_digest(tx.orchardBundle))
+    digest.update(issue_digest(tx.issueBundle))
 
     return digest.digest()
 
@@ -218,6 +238,7 @@ def auth_digest(tx):
     digest.update(transparent_scripts_digest(tx))
     digest.update(sapling_auth_digest(tx.saplingBundle))
     digest.update(orchard_auth_digest(tx.orchardBundle))
+    digest.update(issue_auth_digest(tx.issueBundle))
 
     return digest.digest()
 
@@ -233,6 +254,7 @@ def signature_digest(tx, nHashType, txin):
     digest.update(transparent_sig_digest(tx, nHashType, txin))
     digest.update(sapling_digest(tx.saplingBundle))
     digest.update(orchard_digest(tx.orchardBundle))
+    digest.update(issue_digest(tx.issueBundle))
 
     return digest.digest()
 

qa/supply-chain/audits.toml

@@ -550,4 +550,3 @@ who = "Daira Hopwood <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "1.4.3 -> 1.5.7"
 notes = "The zeroize_c_string unit test has UB, but that's very unlikely to cause a problem in practice."
-