From f829195ea5c42bda2373ad027afc10fa79d3d996 Mon Sep 17 00:00:00 2001
From: Leo <leo@certus.one>
Date: Wed, 26 Jan 2022 00:26:50 +0100
Subject: [PATCH] node/pkg/solana: kill recovery feature

This is no longer needed with SignedObservationRequest.

commit-id:9a3fbf4e
---
 node/pkg/solana/client.go    | 25 ------------------------
 node/pkg/solana/recovery.cfg | 18 ------------------
 node/pkg/solana/recovery.go  | 37 ------------------------------------
 3 files changed, 80 deletions(-)
 delete mode 100644 node/pkg/solana/recovery.cfg
 delete mode 100644 node/pkg/solana/recovery.go

diff --git a/node/pkg/solana/client.go b/node/pkg/solana/client.go
index 8381f8fc..c04f8fc5 100644
--- a/node/pkg/solana/client.go
+++ b/node/pkg/solana/client.go
@@ -129,35 +129,10 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
 		timer := time.NewTicker(time.Second * 1)
 		defer timer.Stop()
 
-		var recovery <-chan time.Time
-		date := recoveryDate.Sub(time.Now().UTC())
-		if date >= 0 && s.commitment == rpc.CommitmentFinalized {
-			logger.Info("waiting for scheduled recovery", zap.Duration("until", date))
-			recovery = time.NewTimer(date).C
-		} else {
-			recovery = make(<-chan time.Time)
-		}
-
 		for {
 			select {
 			case <-ctx.Done():
 				return
-			case <-recovery:
-				logger.Info("executing scheduled recovery")
-
-				rCtx, cancel := context.WithTimeout(ctx, rpcTimeout)
-				defer cancel()
-
-				accs, err := fetchRecoveryConfig()
-				if err != nil {
-					logger.Error("failed to fetch recovery config", zap.Error(err))
-				}
-
-				logger.Info("fetched recovery accounts", zap.Strings("accounts", accs))
-
-				for _, acc := range accs {
-					s.fetchMessageAccount(rCtx, logger, solana.MustPublicKeyFromBase58(acc), 0)
-				}
 			case m := <-s.obsvReqC:
 				if m.ChainId != uint32(vaa.ChainIDSolana) {
 					panic("unexpected chain id")
diff --git a/node/pkg/solana/recovery.cfg b/node/pkg/solana/recovery.cfg
deleted file mode 100644
index 57f7fae8..00000000
--- a/node/pkg/solana/recovery.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-# List of VAA accounts to manually re-observe on recoveryDate.
-
-# 1/b2dd468c9b8c80b3dd9211e9e3fd6ee4d652eb5997b7c9020feae971c278ab07/6551
-HwZgmDqHsLhHHQJWQBzz1o3Aa6EzBkVZvXzg1MNxTFbm
-# 1/b2dd468c9b8c80b3dd9211e9e3fd6ee4d652eb5997b7c9020feae971c278ab07/6552
-E9YXUokvEbjNS6P33RRVHrJ4xUtEUFyzMhPi62em576Q
-# 1/b2dd468c9b8c80b3dd9211e9e3fd6ee4d652eb5997b7c9020feae971c278ab07/10314
-EVk9ACpxKQeH8NbkNegPTVaG6CWbwmn2QJyo7UkPH28R
-# 1/ec7372995d5cc8732397fb0ad35c0121e0eaa90d26f828a534cab54391b3a4f5/33731
-ErBkQNXGGfW85hQtsegDSmsibs5AnDbjTonPp9Yqvk5E
-# 1/ec7372995d5cc8732397fb0ad35c0121e0eaa90d26f828a534cab54391b3a4f5/41437
-24cGT1TTNiDe1M91Y9CSmg56dnTJjzAsJWTzGquzo93V
-# 1/ec7372995d5cc8732397fb0ad35c0121e0eaa90d26f828a534cab54391b3a4f5/42300
-ACfU8GW6VHrNDzfo3AVw4c6kzDzhHVSy5HVFNZS2vetn
-# 1/ec7372995d5cc8732397fb0ad35c0121e0eaa90d26f828a534cab54391b3a4f5/42577
-ENNZYmqouGFEb1bcpQG7J6gQQb5crxE2KTc9ZhCJPmhC
-# 1/ec7372995d5cc8732397fb0ad35c0121e0eaa90d26f828a534cab54391b3a4f5/42578
-6TTP97iPohbUW9EXxhsYvp4f37iqnesctRrabU6PmHmV
diff --git a/node/pkg/solana/recovery.go b/node/pkg/solana/recovery.go
deleted file mode 100644
index 53dddded..00000000
--- a/node/pkg/solana/recovery.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package solana
-
-import (
-	"bufio"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-)
-
-var recoveryDate = time.Date(2022, time.January, 14, 11, 0, 0, 0, time.UTC)
-
-const recoveryConfigUrl = `https://raw.githubusercontent.com/certusone/wormhole/dev.v2/node/pkg/solana/recovery.cfg`
-
-func fetchRecoveryConfig() ([]string, error) {
-	resp, err := http.Get(recoveryConfigUrl)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("non-200 return code when fetching recovery config: %d", resp.StatusCode)
-	}
-
-	scanner := bufio.NewScanner(resp.Body)
-	accs := make([]string, 0)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.HasPrefix(line, "#") || line == "" {
-			continue
-		}
-		accs = append(accs, line)
-	}
-
-	return accs, nil
-}