neutrino: Added unban peer feature

banman/reason.go

@@ -6,7 +6,7 @@ type Reason uint8
 // We prevent using `iota` to ensure the order does not have the value since
 // these are serialized within the database.
 const (
-	// ExcedeedBanThreshold signals that a peer exceeded its ban threshold.
+	// ExceededBanThreshold signals that a peer exceeded its ban threshold.
 	ExceededBanThreshold Reason = 1
 
 	// NoCompactFilters signals that a peer was unable to serve us compact
@@ -20,6 +20,9 @@ const (
 	// InvalidFilterHeaderCheckpoint signals that a peer served us an
 	// invalid filter header checkpoint.
 	InvalidFilterHeaderCheckpoint Reason = 4
+
+	// InvalidBlock signals that a peer served us a bad block.
+	InvalidBlock Reason = 5
 )
 
 // String returns a human-readable description for the reason a peer was banned.
@@ -37,6 +40,9 @@ func (r Reason) String() string {
 	case InvalidFilterHeaderCheckpoint:
 		return "peer served invalid filter header checkpoint"
 
+	case InvalidBlock:
+		return "peer served an invalid block"
+
 	default:
 		return "unknown reason"
 	}

banman/store.go

@@ -66,6 +66,9 @@ type Store interface {
 
 	// Status returns the ban status for a given IP network.
 	Status(*net.IPNet) (Status, error)
+
+	// UnbanIPNet unbans previously banned peer
+	UnbanIPNet(ipNet *net.IPNet) error
 }
 
 // NewStore returns a Store backed by a database.
@@ -136,6 +139,34 @@ func (s *banStore) BanIPNet(ipNet *net.IPNet, reason Reason, duration time.Durat
 	})
 }
 
+// UnbanIPNet removes a ban record for the IP network within the store.
+func (s *banStore) UnbanIPNet(ipNet *net.IPNet) error {
+	err := walletdb.Update(s.db, func(tx walletdb.ReadWriteTx) error {
+		banStore := tx.ReadWriteBucket(banStoreBucket)
+		if banStore == nil {
+			return ErrCorruptedStore
+		}
+		banIndex := banStore.NestedReadWriteBucket(banBucket)
+		if banIndex == nil {
+			return ErrCorruptedStore
+		}
+		reasonIndex := banStore.NestedReadWriteBucket(reasonBucket)
+		if reasonIndex == nil {
+			return ErrCorruptedStore
+		}
+
+		var ipNetBuf bytes.Buffer
+		if err := encodeIPNet(&ipNetBuf, ipNet); err != nil {
+			return fmt.Errorf("unable to encode %v: %v", ipNet, err)
+		}
+		k := ipNetBuf.Bytes()
+
+		return removeBannedIPNet(banIndex, reasonIndex, k)
+	})
+
+	return err
+}
+
 // addBannedIPNet adds an entry to the ban store for the given IP network.
 func addBannedIPNet(banIndex, reasonIndex walletdb.ReadWriteBucket,
 	ipNetKey []byte, reason Reason, duration time.Duration) error {

banman/store_test.go

@@ -123,4 +123,11 @@ func TestBanStore(t *testing.T) {
 	// We'll query for second IP network again as it should now be unknown
 	// to the BanStore. We should expect not to find anything regarding it.
 	checkBanStore(ipNet2, false, 0, 0)
+
+	//Unban ipNet1
+	err = banStore.UnbanIPNet(ipNet1)
+
+	//IpNet1 should be unknown to the BanStore
+	checkBanStore(ipNet1, false, 0, 0)
+
 }