btc retriever and filterer

pkg/super_node/eth/filterer.go

@@ -106,7 +106,7 @@ func (s *ResponseFilterer) filterTransactions(trxFilter TxFilter, response *Stre
 	trxHashes := make([]common.Hash, 0, len(payload.Block.Body().Transactions))
 	if !trxFilter.Off {
 		for i, trx := range payload.Block.Body().Transactions {
-			if checkTransactions(trxFilter.Src, trxFilter.Dst, payload.TxMetaData[i].Src, payload.TxMetaData[i].Dst) {
+			if checkTransactionAddrs(trxFilter.Src, trxFilter.Dst, payload.TxMetaData[i].Src, payload.TxMetaData[i].Dst) {
 				trxBuffer := new(bytes.Buffer)
 				if err := trx.EncodeRLP(trxBuffer); err != nil {
 					return nil, err
@@ -119,7 +119,8 @@ func (s *ResponseFilterer) filterTransactions(trxFilter TxFilter, response *Stre
 	return trxHashes, nil
 }
 
-func checkTransactions(wantedSrc, wantedDst []string, actualSrc, actualDst string) bool {
+// checkTransactionAddrs returns true if either the transaction src and dst are one of the wanted src and dst addresses
+func checkTransactionAddrs(wantedSrc, wantedDst []string, actualSrc, actualDst string) bool {
 	// If we aren't filtering for any addresses, every transaction is a go
 	if len(wantedDst) == 0 && len(wantedSrc) == 0 {
 		return true
@@ -185,21 +186,16 @@ func checkReceipts(rct *types.Receipt, wantedTopics, actualTopics [][]string, wa
 	return false
 }
 
+// filterMatch returns true if the actualTopics conform to the wantedTopics filter
 func filterMatch(wantedTopics, actualTopics [][]string) bool {
-	// actualTopics should always be length 4, members could be nil slices though
-	lenWantedTopics := len(wantedTopics)
+	// actualTopics should always be length 4, but the members can be nil slices
 	matches := 0
 	for i, actualTopicSet := range actualTopics {
-		if i < lenWantedTopics {
+		if i < len(wantedTopics) && len(wantedTopics[i]) > 0 {
 			// If we have topics in this filter slot, count as a match if one of the topics matches
-			if len(wantedTopics[i]) > 0 {
-				matches += slicesShareString(actualTopicSet, wantedTopics[i])
-			} else {
-				// Filter slot is empty, not matching any topics at this slot => counts as a match
-				matches++
-			}
+			matches += slicesShareString(actualTopicSet, wantedTopics[i])
 		} else {
-			// Filter slot doesn't exist, not matching any topics at this slot => count as a match
+			// Filter slot is either empty or doesn't exist => not matching any topics at this slot => counts as a match
 			matches++
 		}
 	}

pkg/super_node/eth/subscription_config.go

@@ -86,8 +86,8 @@ func NewEthSubscriptionConfig() (*SubscriptionSettings, error) {
 	sc.End = big.NewInt(viper.GetInt64("superNode.ethSubscription.endingBlock"))
 	// Below default to false, which means we get all headers and no uncles by default
 	sc.HeaderFilter = HeaderFilter{
-		Off:    viper.GetBool("superNode.ethSubscription.off"),
-		Uncles: viper.GetBool("superNode.ethSubscription.uncles"),
+		Off:    viper.GetBool("superNode.ethSubscription.headerFilter.off"),
+		Uncles: viper.GetBool("superNode.ethSubscription.headerFilter.uncles"),
 	}
 	// Below defaults to false and two slices of length 0
 	// Which means we get all transactions by default

pkg/super_node/eth/types.go

@@ -20,8 +20,6 @@ import (
 	"encoding/json"
 	"math/big"
 
-	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ipfs/go-block-format"
@@ -40,10 +38,6 @@ type IPLDPayload struct {
 	StorageNodes    map[common.Hash][]TrieNode
 }
 
-func (ip IPLDPayload) Value() shared.StreamedIPLDs {
-	return ip
-}
-
 // Trie struct used to flag node as leaf or not
 type TrieNode struct {
 	Key   common.Hash
@@ -105,24 +99,20 @@ type StreamResponse struct {
 	err     error
 }
 
-func (sr StreamResponse) Value() shared.ServerResponse {
-	return sr
-}
-
-func (sd *StreamResponse) ensureEncoded() {
-	if sd.encoded == nil && sd.err == nil {
-		sd.encoded, sd.err = json.Marshal(sd)
+func (sr *StreamResponse) ensureEncoded() {
+	if sr.encoded == nil && sr.err == nil {
+		sr.encoded, sr.err = json.Marshal(sr)
 	}
 }
 
 // Length to implement Encoder interface for StateDiff
-func (sd *StreamResponse) Length() int {
-	sd.ensureEncoded()
-	return len(sd.encoded)
+func (sr *StreamResponse) Length() int {
+	sr.ensureEncoded()
+	return len(sr.encoded)
 }
 
 // Encode to implement Encoder interface for StateDiff
-func (sd *StreamResponse) Encode() ([]byte, error) {
-	sd.ensureEncoded()
-	return sd.encoded, sd.err
+func (sr *StreamResponse) Encode() ([]byte, error) {
+	sr.ensureEncoded()
+	return sr.encoded, sr.err
 }