From 6f56b8b8e936e85e07d19e7091c27974567a9cc9 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Wed, 25 Sep 2019 17:18:27 -0700 Subject: [PATCH] Store compactBlocks --- common/cache.go | 22 +++++++++++++--------- common/common.go | 18 ++++++++---------- frontend/service.go | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/common/cache.go b/common/cache.go index 5c691f5..0e456bf 100644 --- a/common/cache.go +++ b/common/cache.go @@ -3,7 +3,7 @@ package common import ( "bytes" - "github.com/adityapk00/lightwalletd/parser" + "github.com/adityapk00/lightwalletd/walletrpc" "github.com/pkg/errors" ) @@ -13,7 +13,7 @@ type BlockCache struct { FirstBlock int LastBlock int - m map[int]*parser.Block + m map[int]*walletrpc.CompactBlock } func New(maxEntries int) *BlockCache { @@ -21,12 +21,12 @@ func New(maxEntries int) *BlockCache { MaxEntries: maxEntries, FirstBlock: -1, LastBlock: -1, - m: make(map[int]*parser.Block), + m: make(map[int]*walletrpc.CompactBlock), } } -func (c *BlockCache) Add(height int, block *parser.Block) error { - println("Cache add", height) +func (c *BlockCache) Add(height int, block *walletrpc.CompactBlock) error { + //println("Cache add", height) if c.FirstBlock == -1 && c.LastBlock == -1 { // If this is the first block, prep the data structure c.FirstBlock = height @@ -35,6 +35,7 @@ func (c *BlockCache) Add(height int, block *parser.Block) error { // Overwriting an existing entry. If so, then remove all // subsequent blocks, since this might be a reorg for i := height; i <= c.LastBlock; i++ { + //println("Deleteing at height", i) delete(c.m, i) } c.LastBlock = height - 1 @@ -44,7 +45,7 @@ func (c *BlockCache) Add(height int, block *parser.Block) error { return errors.New("Blocks need to be added sequentially") } - if c.m[height-1] != nil && !bytes.Equal(block.GetPrevHash(), c.m[height-1].GetEncodableHash()) { + if c.m[height-1] != nil && !bytes.Equal(block.PrevHash, c.m[height-1].Hash) { return errors.New("Prev hash of the block didn't match") } @@ -55,23 +56,26 @@ func (c *BlockCache) Add(height int, block *parser.Block) error { // If the cache is full, remove the oldest block if c.LastBlock-c.FirstBlock+1 > c.MaxEntries { + //println("Deleteing at height", c.FirstBlock) delete(c.m, c.FirstBlock) c.FirstBlock = c.FirstBlock + 1 } + //println("Cache size is ", len(c.m)) return nil } -func (c *BlockCache) Get(height int) *parser.Block { - println("Cache get", height) +func (c *BlockCache) Get(height int) *walletrpc.CompactBlock { + //println("Cache get", height) if c.LastBlock == -1 || c.FirstBlock == -1 { return nil } if height < c.FirstBlock || height > c.LastBlock { + //println("Cache miss: index out of range") return nil } - println("Cache returned") + //println("Cache returned") return c.m[height] } diff --git a/common/common.go b/common/common.go index 458e4e3..1126820 100644 --- a/common/common.go +++ b/common/common.go @@ -45,7 +45,7 @@ func GetSaplingInfo(rpcClient *rpcclient.Client) (int, string, error) { return int(saplingHeight), chainName, nil } -func getBlockFromRPC(rpcClient *rpcclient.Client, height int) (*parser.Block, error) { +func getBlockFromRPC(rpcClient *rpcclient.Client, height int) (*walletrpc.CompactBlock, error) { params := make([]json.RawMessage, 2) params[0] = json.RawMessage("\"" + strconv.Itoa(height) + "\"") params[1] = json.RawMessage("0") @@ -85,10 +85,10 @@ func getBlockFromRPC(rpcClient *rpcclient.Client, height int) (*parser.Block, er return nil, errors.New("received overlong message") } - return block, nil + return block.ToCompact(), nil } -func GetBlock(rpcClient *rpcclient.Client, cache *BlockCache, height int) (*parser.Block, error) { +func GetBlock(rpcClient *rpcclient.Client, cache *BlockCache, height int) (*walletrpc.CompactBlock, error) { // First, check the cache to see if we have the block block := cache.Get(height) if block != nil { @@ -104,16 +104,16 @@ func GetBlock(rpcClient *rpcclient.Client, cache *BlockCache, height int) (*pars prevBlock := cache.Get(height - 1) if prevBlock != nil { - if !bytes.Equal(prevBlock.GetEncodableHash(), block.GetPrevHash()) { + if !bytes.Equal(prevBlock.Hash, block.PrevHash) { // Reorg! reorgCount := 0 cacheBlock := cache.Get(height - reorgCount) - rpcBlocks := []*parser.Block{} + rpcBlocks := []*walletrpc.CompactBlock{} for ; reorgCount <= 100 && cacheBlock != nil && - !bytes.Equal(block.GetPrevHash(), cacheBlock.GetEncodableHash()); reorgCount++ { + !bytes.Equal(block.PrevHash, cacheBlock.Hash); reorgCount++ { block, err = getBlockFromRPC(rpcClient, height-reorgCount-1) if err != nil { @@ -133,7 +133,7 @@ func GetBlock(rpcClient *rpcclient.Client, cache *BlockCache, height int) (*pars // At this point, the block.prevHash == cache.hash // Store all blocks starting with 'block' for i := len(rpcBlocks) - 1; i >= 0; i-- { - cache.Add(rpcBlocks[i].GetHeight(), rpcBlocks[i]) + cache.Add(int(rpcBlocks[i].Height), rpcBlocks[i]) } } } @@ -146,8 +146,6 @@ func GetBlock(rpcClient *rpcclient.Client, cache *BlockCache, height int) (*pars func GetBlockRange(rpcClient *rpcclient.Client, cache *BlockCache, blockOut chan<- walletrpc.CompactBlock, errOut chan<- error, start, end int) { - println("Getting block range") - // Go over [start, end] inclusive for i := start; i <= end; i++ { block, err := GetBlock(rpcClient, cache, i) @@ -156,7 +154,7 @@ func GetBlockRange(rpcClient *rpcclient.Client, cache *BlockCache, return } - blockOut <- *block.ToCompact() + blockOut <- *block } errOut <- nil diff --git a/frontend/service.go b/frontend/service.go index ae8aa06..9a4a917 100644 --- a/frontend/service.go +++ b/frontend/service.go @@ -136,7 +136,7 @@ func (s *SqlStreamer) GetBlock(ctx context.Context, id *walletrpc.BlockID) (*wal return nil, err } - return cBlock.ToCompact(), err + return cBlock, err } }