diff --git a/p2pool/sidechain/sidechain.go b/p2pool/sidechain/sidechain.go index ae305ef..a96eb08 100644 --- a/p2pool/sidechain/sidechain.go +++ b/p2pool/sidechain/sidechain.go @@ -240,11 +240,6 @@ func (c *SideChain) BlockSeen(block *PoolBlock) bool { return true } - if block.ShareVersion() > ShareVersion_V2 { - // need to pre-fill to have working SideTemplateId - _, _ = c.PreprocessBlock(block) - } - fullId := block.FullId(c.Consensus()) c.seenBlocksLock.Lock() @@ -1187,17 +1182,6 @@ func (c *SideChain) getPoolBlockByMerkleRoot(id types.Hash) *PoolBlock { return b } -func (c *SideChain) GetPoolBlockByCoinbaseExtraIdentifier(version ShareVersion, id types.Hash) *PoolBlock { - if id == types.ZeroHash { - return nil - } - if version > ShareVersion_V2 { - return c.GetPoolBlockByMerkleRoot(id) - } else { - return c.GetPoolBlockByTemplateId(id) - } -} - func (c *SideChain) GetPoolBlocksByHeight(height uint64) []*PoolBlock { c.sidechainLock.RLock() defer c.sidechainLock.RUnlock()