Skip to content

Commit a8a6007

Browse files
authored
refactor(programs): Consolidate Merkle trees into one PDA (#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 1834b3e commit a8a6007

File tree

128 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.

128 files changed

+1445
-4512
lines changed

Cargo.lock

+43
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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,
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"pubkey": "5EMc8sCbHeb1HtRFifcbCiXN66kX6Wddrd61EkdJun6Y",
33
"account": {
4-
"lamports": 1350240,
4+
"lamports": 1294560,
55
"data": [
6-
"xtvTnP1myPUCY+L7WEJcIRnY07lwy9TuaZBIebD9aqhznpq8Pv+mUQEAAAAAAAAAAQAAAAAAAAACAAAAAAAAAAAA",
6+
"xtvTnP1myPUCY+L7WEJcIRnY07lwy9TuaZBIebD9aqhznpq8Pv+mUQEAAAAAAAAAAgAAAAAAAAAAAA==",
77
"base64"
88
],
99
"owner": "JA5cjkRJ1euVi9xLWsCJVzsRzEkT8vcC4rqw9sVAo5d6",
1010
"executable": false,
1111
"rentEpoch": 18446744073709551615,
12-
"space": 66
12+
"space": 58
1313
}
1414
}

cli/accounts/merkle-tree-set-0.json

+14
Large diffs are not rendered by default.

cli/accounts/misc/authorityDJpbogMSrK94E1zvvJydtkqoE4sknuzmMRoutd6B7TKj.json

-14
This file was deleted.

cli/accounts/misc/defaultRelayerLookUpTableEUwVvyTZrBVyB1LUQf6b6WWcdXgcgYz5E5mcWUtkW2vX.json

-14
This file was deleted.

cli/accounts/misc/eventMerkleTreePubkey.json

-14
This file was deleted.

0 commit comments

Comments
 (0)