From 846578f022d1abd8897a7591bbbd15735133d760 Mon Sep 17 00:00:00 2001 From: AionJayT Date: Thu, 30 Jan 2020 14:41:50 -0500 Subject: [PATCH] Implemented a blockStore call for query 2 layer parents --- modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java b/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java index da0d78fea1..f33af0e4f8 100644 --- a/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java +++ b/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java @@ -1387,7 +1387,11 @@ void redoIndexWithoutSideChains(Block block) { /** * Retrieve three generation blocks with unity protocol info with one lock. * @param hash given hash of the block +<<<<<<< Updated upstream * @return the 3 generation block data have matched hash with unity protocol info. Block[0] is the parent block, +======= + * @return the 3 generation block data has matched hash with unity protocol info. Block[0] is the parent block, +>>>>>>> Stashed changes * Block[1] is the grandParent block, and Block[2] is the greatParentBlock. The return might only contain the parent * block and still return the 3-elements array. */