Skip to content

Commit fc7e9bc

Browse files
vadorovskyvadorovsky
authored
refactor(programs): Consolidate Merkle trees into one PDA (Lightprotocol#444)
Maintaining multiple PDAs requires more effort and we need to switch all types of Merkle trees at the same time anyway. We also need to make sure that the sizes of the Merkle trees are consistent. Keeping them in one PDA will make it easier. Other changes: * Merkle tree parameters * height: 22 * roots: 2800
1 parent 67164b1 commit fc7e9bc

File tree

118 files changed

+1445
-4512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1445
-4512
lines changed

‎Cargo.lock

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎circuit-lib/circuit-lib.circom/src/transaction/privateProgramTransaction4In4OutMain.circom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component main {
1717
publicTransactionHash
1818
]
1919
} = PrivateProgramTransaction(
20-
18,
20+
22,
2121
4,
2222
4,
2323
184598798020101492503359154328231866914977581098629757339001774613643340069,

‎circuit-lib/circuit-lib.circom/src/transaction/privateTransaction10In2OutMain.circom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ component main {
1414
publicMintPublicKey
1515
]
1616
} = PrivateTransaction(
17-
18,
17+
22,
1818
10,
1919
2,
2020
184598798020101492503359154328231866914977581098629757339001774613643340069,

‎circuit-lib/circuit-lib.circom/src/transaction/privateTransaction2In2OutMain.circom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ component main {
1515
publicMintPublicKey
1616
]
1717
} = PrivateTransaction(
18-
18,
18+
22,
1919
2,
2020
2,
2121
184598798020101492503359154328231866914977581098629757339001774613643340069,

‎circuit-lib/circuit-lib.circom/src/transaction/publicProgramTransaction2In2OutMain.circom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ component main {
1616
publicNewAddress
1717
]
1818
} = PublicProgramTransaction(
19-
18,
19+
22,
2020
2,
2121
2,
2222
184598798020101492503359154328231866914977581098629757339001774613643340069,

‎circuit-lib/circuit-lib.circom/src/transaction/publicTransaction10In2OutMain.circom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ component main {
1010
publicDataHash
1111
]
1212
} = PublicTransaction(
13-
18,
13+
22,
1414
8,
1515
2,
1616
184598798020101492503359154328231866914977581098629757339001774613643340069,

‎cli/accounts/misc/authority2cxC8e8uNYLcymH6RTGuJs3N8fXGkwmMpw45pY65Ay86.json renamed to ‎cli/accounts/authority2cxC8e8uNYLcymH6RTGuJs3N8fXGkwmMpw45pY65Ay86.json

File renamed without changes.

‎cli/accounts/misc/authority2mNCqdntwtm9cTLjgfdS85JTF92mgNerqA9TgGnxFzLt.json renamed to ‎cli/accounts/authority2mNCqdntwtm9cTLjgfdS85JTF92mgNerqA9TgGnxFzLt.json

File renamed without changes.

‎cli/accounts/misc/authorityJ1RRetZ4ujphU75LP8RadjXMf3sA12yC2R44CF7PmU7i.json renamed to ‎cli/accounts/authorityJ1RRetZ4ujphU75LP8RadjXMf3sA12yC2R44CF7PmU7i.json

File renamed without changes.

‎cli/accounts/misc/authorityJ85SuNBBsba7FQS66BiBCQjiQrQTif7v249zL2ffmRZc.json renamed to ‎cli/accounts/authorityJ85SuNBBsba7FQS66BiBCQjiQrQTif7v249zL2ffmRZc.json

File renamed without changes.

0 commit comments

Comments
 (0)