add fromActiveProducerOnly to blocks and blocksPaged

eden-network · Aug 23, 2021 · c81ed29 · c81ed29
1 parent 188cbaa
commit c81ed29
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/packages/data/package.json b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eden-network/data",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "author": "Jeffrey Quesnelle <jeff@edennetwork.io>",

diff --git a/packages/data/src/governance.test.ts b/packages/data/src/governance.test.ts
@@ -9,7 +9,7 @@ async function rewardCalculation(network: Network) {
     const allEpochs = (await epochs({startEpochNumber: 1, endEpochNumber: currentRewardSchedule.lastEpoch.epochNumber, includeRewards: true, network}));
     const startEpoch = allEpochs[0];
     const [startBlockResult, startRewardScheduleResult] = await Promise.all([
-        blocks({startBlock: startEpoch.startBlock?.number, endBlock: startEpoch.endBlock?.number, network}),
+        blocks({startBlock: startEpoch.startBlock?.number, endBlock: startEpoch.endBlock?.number, fromActiveProducerOnly: false, network}),
         rewardSchedule({block: startEpoch.startBlock?.number, network})
     ]);
 
@@ -29,7 +29,7 @@ async function rewardCalculation(network: Network) {
 
         const epoch = allEpochs[i];
         const [blockResult, rewardScheduleResult, producersResult] = await Promise.all([
-            blocks({startBlock: epoch.startBlock?.number, endBlock: epoch.endBlock?.number, network}),
+            blocks({startBlock: epoch.startBlock?.number, endBlock: epoch.endBlock?.number, fromActiveProducerOnly: true, network}),
             rewardSchedule({block: epoch.startBlock?.number, network}),
             producers({block: epoch.endBlock?.number + 1, network})
         ]);
@@ -130,6 +130,7 @@ describe("governance", () => {
             const results = await blocks({
                 startBlock: 10766656,
                 endBlock:  10766657,
+                fromActiveProducerOnly: false,
                 network: 'ropsten'
             });
             expect(results.length).toEqual(2);
@@ -148,8 +149,10 @@ describe("governance", () => {
 
     describe("blocksPaged", () => {
         it("mainnet", async () => {
-            const results = await blocksPaged({start: 0, num: 10, network: "mainnet"});
+            const results = await blocksPaged({start: 0, num: 10, fromActiveProducerOnly: true, network: "mainnet"});
             expect(results.length).toEqual(10);
+            expect(results[0].fromActiveProducer).toStrictEqual(true);
+            expect(results[0].number).toBeGreaterThan(0);
         });
     });
 

diff --git a/packages/data/src/governance.ts b/packages/data/src/governance.ts
@@ -71,15 +71,16 @@ export async function producerRewardCollectorChanges({startBlock, endBlock, netw
         .then(results => results.sort((a, b) => a.blockNumber - b.blockNumber));
 }
 
-export async function blocks({startBlock, endBlock, network}: {startBlock: number, endBlock: number, network: Network}) {
+export async function blocks({startBlock, endBlock, fromActiveProducerOnly, network}: {startBlock: number, endBlock: number, fromActiveProducerOnly: boolean, network: Network}) {
     const promise = graphResultsPager({
         api: GRAPH_API_ENDPOINTS[network].governance,
         query: {
             entity: 'blocks',
             selection: {
                 where: {
                     number_gte: startBlock,
-                    number_lte: endBlock
+                    number_lte: endBlock,
+                    fromActiveProducer: fromActiveProducerOnly ? true : undefined
                 }
             },
             properties: block.properties
@@ -91,16 +92,17 @@ export async function blocks({startBlock, endBlock, network}: {startBlock: numbe
         .then(results => results.sort((a, b) => a.number - b.number));
 }
 
-export async function blocksPaged({start, num, network}: {start: number, num: number, network: Network}) {
+export async function blocksPaged({start, num, fromActiveProducerOnly, network}: {start: number, num: number, fromActiveProducerOnly: boolean, network: Network}) {
+    const condition = fromActiveProducerOnly ? `, where: {fromActiveProducer: true}` : '';
     const result = await request(GRAPH_API_ENDPOINTS[network].governance,
         gql`{
-                blocks(orderBy: number, orderDirection: desc, first: ${num}, skip: ${start}) {
+                blocks(orderBy: number, orderDirection: desc, first: ${num}, skip: ${start}${condition}) {
                     ${block.properties.toString()}
                 }
             }`
     );
 
-    return result.blocks ? producerProperties.callback(result.blocks) : undefined;
+    return result.blocks ? block.callback(result.blocks) : undefined;
 }
 
 export async function rewardSchedule({block, network}: {block?: number, network: Network} = {network: 'mainnet'}) {