Skip to content
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

Prv epoch/epoch 1 #14

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions merkleTree/withdraw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,21 @@ async function queryPRVNonZeroBalancesAtBlock(
* Grabs PRV staking positions from the Subgraph
*/
async function fetchPRVHolders(
blockNumber: number
blockNumber: number,
windowIndex: number
): Promise<WithdrawalDistributorInput> {
const response = await queryPRVNonZeroBalancesAtBlock(blockNumber);
const { erc20Balances } = response.data;
const recipients: WithdrawalRecipient = {};
erc20Balances.forEach((balance) => {
recipients[balance.account.id] = {
windowIndex: 0,
windowIndex,
amount: balance.valueExact,
};
});

return {
windowIndex: 0,
windowIndex,
maxAmount: "0",
startBlock: blockNumber,
endBlock: blockNumber,
Expand Down Expand Up @@ -86,15 +87,17 @@ export const makeTreeWithPrompt = async ({
startBlock,
endBlock,
budget,
isDryRun = true,
}: {
epoch: unknown;
windowIndex: number;
startBlock: number;
endBlock: number;
budget: string;
blockNumber: number;
isDryRun?: boolean;
}) => {
const holders = await fetchPRVHolders(blockNumber);
const holders = await fetchPRVHolders(blockNumber, windowIndex);

// create the tree as a string
const tree = JSON.stringify(
Expand All @@ -110,7 +113,7 @@ export const makeTreeWithPrompt = async ({

// write the file
const fileDestination = destination(epoch);
writeFileSync(fileDestination, tree);
if (!isDryRun) writeFileSync(fileDestination, tree);
console.log(tree);
console.log(fileDestination);
console.log(
Expand All @@ -129,6 +132,10 @@ async function main() {
if (inputs.length !== 4) {
throw new Error("Incorrect number of inputs");
}
const writeFile = await prompt(
"Do you want to write the merkleTree file? (y/n)\n"
);
const isDryRun = writeFile === "n";
let [_windowIndex, budget, _startBlock, _endBlock] = inputs;

await makeTreeWithPrompt({
Expand All @@ -138,6 +145,7 @@ async function main() {
endBlock: parseInt(_endBlock),
budget,
blockNumber,
isDryRun,
});
}

Expand Down
193 changes: 193 additions & 0 deletions reports/2023-7/merkle-verifier-PRV.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
{
"windowIndex": 1,
"maxAmount": "100000000000000000000",
"startBlock": 17809274,
"endBlock": 18027360,
"recipients": {
"0x096b4f2253a430f33edc9b8e6a8e1d2fb4faa317": {
"windowIndex": 1,
"amount": "117482599216435872824603",
"proof": [
"0x08f6eefd274d59b8cc2d7d00a02c937d5a967c3e4b0e059db9fe76d048df531e",
"0xdb77fc11ebe35827f52edf4db17260051166147a0bb4e31e2e60034c2041f3d2",
"0x081cf72e514d6b658ec595b158db8a659c076efedc0490d3e92898197f014646",
"0xcc915ebd17e17e4d0a1594ead151ba497d7670d09f5bce4a3ef9bad9ea4b8f2e",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0x2024f13b2fdb7957feb422af38edd5218e79ce05": {
"windowIndex": 1,
"amount": "150000000000000000000",
"proof": [
"0x65a7dcf3a7fc2573ba447f56bb01c4cdf2a80bb921d96039690ff21ba79c86c9",
"0x0c5326a4b7ccbfac39a14e81b0d013756997d4c0d618538530c3b37ec7228c37",
"0xef24296e143b1acfcd91e3604f26837a20a8785d7b1141fe68f9e156d6ad8d0d",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
},
"0x355406f69200eca09000cd31033c41e77ad8c49e": {
"windowIndex": 1,
"amount": "4000000000000000000",
"proof": [
"0x95ca6f1c1abd8b22f8deb29c18ed916fd28b2e126b0fab171fc70df684c5f197",
"0xcbbf4577970ca8c6f2f48fc77cd2132a0ab0a001888a1167bb605a2e43d38cac",
"0x451908dec11d4d7b125d99940296b9fde85339ccca3df8a922b24d280c87813c",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0x3e541de9da4dcc73c7cfd225d4da6f232d758393": {
"windowIndex": 1,
"amount": "35389785624600151889",
"proof": [
"0x55c45e6e0ae4afb800260bfb18b8dcf9f058294e1db0ecc34202aad107194014",
"0x33c928fdd045c57c6237a303532b1fb4c61c72187236081dc023ae7814991b0f",
"0xef24296e143b1acfcd91e3604f26837a20a8785d7b1141fe68f9e156d6ad8d0d",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
},
"0x4cc408d5428dd610630ad0e198d8e6d8acfed4e6": {
"windowIndex": 1,
"amount": "10",
"proof": [
"0x06065c1062faed81c8937aba4f8fed892a4099c27d47ed14b8f1c81cf41a38e8",
"0x0ecf3c249445acd9153436ade6e0be3f8c9658ca5e5008da2abab8cd9c19e035",
"0x081cf72e514d6b658ec595b158db8a659c076efedc0490d3e92898197f014646",
"0xcc915ebd17e17e4d0a1594ead151ba497d7670d09f5bce4a3ef9bad9ea4b8f2e",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0x6458a23b020f489651f2777bd849dded34dfccd2": {
"windowIndex": 1,
"amount": "9788381",
"proof": [
"0xcc700b7a4453df515832f93458f6c800c2b2c896ca6be82ea6a9ffeba23ff197",
"0xf7e2a56a02085bc673da36250c3d4e16e197bff813f6e0cb92e529da3b0f716f",
"0x451908dec11d4d7b125d99940296b9fde85339ccca3df8a922b24d280c87813c",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0x6d98f705bdf4ee437b15d0de31a5a1a5e55ea14d": {
"windowIndex": 1,
"amount": "16237463632999537733",
"proof": [
"0x650dbc79bda6319f0f3a0a4df912663b6f8f50e809fb0ecde612e444842a84d9",
"0x33c928fdd045c57c6237a303532b1fb4c61c72187236081dc023ae7814991b0f",
"0xef24296e143b1acfcd91e3604f26837a20a8785d7b1141fe68f9e156d6ad8d0d",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
},
"0x6e09647dd1fb26d8161c06519d5a5e5a323f8e04": {
"windowIndex": 1,
"amount": "65954626947479466",
"proof": [
"0x3aeea20922a45edd549f15cb55fb1ab42bef570f1ef6f325f42bf2bed55631e2",
"0xa1e81abe11fd586104cdf5f3637a762462c1d1fe0387fac76fcfbdca8045ef29",
"0xc463c52ef69bdf8b82aa69a93b998854a14e8d6dcf8b1e1c9ab1092e84815099",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
},
"0x7ab1daa0c03886af6f2c2b62afc434b8119843b9": {
"windowIndex": 1,
"amount": "10000000000000000000",
"proof": [
"0x162b346a7c58f4206d09efc1c1e3634a2b0a2806ec9df54bd989ce2210f6f784",
"0xdb77fc11ebe35827f52edf4db17260051166147a0bb4e31e2e60034c2041f3d2",
"0x081cf72e514d6b658ec595b158db8a659c076efedc0490d3e92898197f014646",
"0xcc915ebd17e17e4d0a1594ead151ba497d7670d09f5bce4a3ef9bad9ea4b8f2e",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0x7e3b9e461d1ccd4d0ec4cf09fc1de9d6d4e335ac": {
"windowIndex": 1,
"amount": "196349142023421978192",
"proof": [
"0x4ac255cbbf85c01c18b51a1a7ea2a25da16c0633650d3a39f451bc44755df88e",
"0xa1e81abe11fd586104cdf5f3637a762462c1d1fe0387fac76fcfbdca8045ef29",
"0xc463c52ef69bdf8b82aa69a93b998854a14e8d6dcf8b1e1c9ab1092e84815099",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
},
"0xa745ff5161b572c3177f6c28694ad061a68efb93": {
"windowIndex": 1,
"amount": "1000000000000000000",
"proof": [
"0x19ccde16b707d45fcd03e7e0428919dab89df9dde13849c08a0523515c8f6a9a",
"0xccb8e65f1ec80d34ebe54eaaf4a7d96a125211c1883edc3ec9c251c3a0670d84",
"0xc463c52ef69bdf8b82aa69a93b998854a14e8d6dcf8b1e1c9ab1092e84815099",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
},
"0xad30f7eebd9bd5150a256f47da41d4403033cdf0": {
"windowIndex": 1,
"amount": "487605792948960000",
"proof": [
"0xa29d402af401d27bfbab0f7d9e1cb01dc3195e4a3aa691a81f7fcb531579222c",
"0xcbbf4577970ca8c6f2f48fc77cd2132a0ab0a001888a1167bb605a2e43d38cac",
"0x451908dec11d4d7b125d99940296b9fde85339ccca3df8a922b24d280c87813c",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0xbe8fe12b9eb1ca2a593e6c070c71c294b6fe9f00": {
"windowIndex": 1,
"amount": "2102384728897452707061",
"proof": [
"0xe7a18c19a60bc74c3bf360cbd985141c1d016602106ca0d78717b857a70c4903",
"0x88008bac036eb958dabfc3e57b47391941cb1c3f53daf390525bef7b39ea19f4",
"0xcc915ebd17e17e4d0a1594ead151ba497d7670d09f5bce4a3ef9bad9ea4b8f2e",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0xc07ef9fda2d42a7757172f6a7cda2a63599591ed": {
"windowIndex": 1,
"amount": "35000000000000000000",
"proof": [
"0xfee7da7e92440678eb85b904a5f4c97a7bc864a9720034ae010440c272b646b0",
"0x88008bac036eb958dabfc3e57b47391941cb1c3f53daf390525bef7b39ea19f4",
"0xcc915ebd17e17e4d0a1594ead151ba497d7670d09f5bce4a3ef9bad9ea4b8f2e",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0xe5d45fa1b783aa011914486d01f07f724395cc22": {
"windowIndex": 1,
"amount": "4000000000000000000",
"proof": [
"0x8f0c2f0890080b94346077b7996cecba3339ef0f6f6f1548ab8f829826cd678d",
"0x0c5326a4b7ccbfac39a14e81b0d013756997d4c0d618538530c3b37ec7228c37",
"0xef24296e143b1acfcd91e3604f26837a20a8785d7b1141fe68f9e156d6ad8d0d",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
},
"0xec5c16f3eaf86a801a3e89201dd39bddd1786cbf": {
"windowIndex": 1,
"amount": "4645051218822889222",
"proof": [
"0xad07903c8e61c29ded124b88a7e7447bcbb5170b1516f16689eef6eb2f2631bb",
"0xf7e2a56a02085bc673da36250c3d4e16e197bff813f6e0cb92e529da3b0f716f",
"0x451908dec11d4d7b125d99940296b9fde85339ccca3df8a922b24d280c87813c",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0xf3dd72ac3c9833574491861793e8ffe1f07c8905": {
"windowIndex": 1,
"amount": "341563219888733",
"proof": [
"0x05d1ddf23b007302bc81323778669b9240e7e2e309094eec79be4103ea81387b",
"0x0ecf3c249445acd9153436ade6e0be3f8c9658ca5e5008da2abab8cd9c19e035",
"0x081cf72e514d6b658ec595b158db8a659c076efedc0490d3e92898197f014646",
"0xcc915ebd17e17e4d0a1594ead151ba497d7670d09f5bce4a3ef9bad9ea4b8f2e",
"0xa13f3b71d7b83bbe4fc8525e52c943df40db7e47691b038e692bb5d44280c0a7"
]
},
"0xfc11d5abe8d1f20317dbc4e23129ede5ef739e8f": {
"windowIndex": 1,
"amount": "3000000000000000000",
"proof": [
"0x351f492b04656ea045ada6b84e082fe624b222c8018e7df703a5611142dfb9a8",
"0xccb8e65f1ec80d34ebe54eaaf4a7d96a125211c1883edc3ec9c251c3a0670d84",
"0xc463c52ef69bdf8b82aa69a93b998854a14e8d6dcf8b1e1c9ab1092e84815099",
"0xfae137de375050a2791af2ac2a3cc6ce48ee2dcd9017b998784e026e668ca092"
]
}
},
"root": "0xc77fc4328fdbe211422f8f3589623ec8671013db4bada70d41c2105af6a5bfe2"
}