feat(BUX-417): remove monitor, ITC flag and IncomingTransaction (#532)

* chore(BUX-417): remove monitor * chore(BUX-417): remove ITC flag * chore(BUX-417): remove incoming tx
BuxOrg · Feb 12, 2024 · 04af3e4 · 04af3e4
1 parent 292c86b
commit 04af3e4
Show file tree

Hide file tree

Showing 35 changed files with 143 additions and 1,428 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -19,5 +19,10 @@
   "go.lintTool": "golangci-lint",
   "go.lintFlags": [
     "--fast"
-  ]
-}
+  ],
+  "[go][go.mod]": {
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit"
+    }
+  }
+}
diff --git a/action_destination.go b/action_destination.go
@@ -2,18 +2,14 @@ package bux
 
 import (
 	"context"
-	"database/sql"
-	"time"
-
 	"github.com/mrz1836/go-datastore"
-	customTypes "github.com/mrz1836/go-datastore/custom_types"
 )
 
 // NewDestination will get a new destination for an existing xPub
 //
 // xPubKey is the raw public xPub
 func (c *Client) NewDestination(ctx context.Context, xPubKey string, chain uint32,
-	destinationType string, monitor bool, opts ...ModelOps) (*Destination, error) {
+	destinationType string, opts ...ModelOps) (*Destination, error) {
 
 	// Check for existing NewRelic transaction
 	ctx = c.GetOrStartTxn(ctx, "new_destination")
@@ -39,13 +35,6 @@ func (c *Client) NewDestination(ctx context.Context, xPubKey string, chain uint3
 		return nil, err
 	}
 
-	if monitor {
-		destination.Monitor = customTypes.NullTime{NullTime: sql.NullTime{
-			Valid: true,
-			Time:  time.Now(),
-		}}
-	}
-
 	// Save the destination
 	if err = destination.Save(ctx); err != nil {
 		return nil, err
@@ -57,7 +46,7 @@ func (c *Client) NewDestination(ctx context.Context, xPubKey string, chain uint3
 
 // NewDestinationForLockingScript will create a new destination based on a locking script
 func (c *Client) NewDestinationForLockingScript(ctx context.Context, xPubID, lockingScript string,
-	monitor bool, opts ...ModelOps) (*Destination, error) {
+	opts ...ModelOps) (*Destination, error) {
 
 	// Check for existing NewRelic transaction
 	ctx = c.GetOrStartTxn(ctx, "new_destination_for_locking_script")
@@ -77,6 +66,7 @@ func (c *Client) NewDestinationForLockingScript(ctx context.Context, xPubID, loc
 		return nil, ErrUnknownLockingScript
 	}
 
+<<<<<<< HEAD
 	// set the monitoring, passed down from the initiating function
 	// this will be set when calling NewDestination from http, but not for instance paymail
 	if monitor {
@@ -86,6 +76,8 @@ func (c *Client) NewDestinationForLockingScript(ctx context.Context, xPubID, loc
 		}}
 	}
 
+=======
+>>>>>>> 06feaba (feat(BUX-417): remove monitor, ITC flag and IncomingTransaction (#532))
 	// Save the destination
 	if err := destination.Save(ctx); err != nil {
 		return nil, err

diff --git a/action_destination_test.go b/action_destination_test.go
@@ -30,7 +30,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_NewDestination() {
 
 			var destination *Destination
 			destination, err = tc.client.NewDestination(
-				ctx, testXPub, utils.ChainExternal, utils.ScriptTypePubKeyHash, false, opts...,
+				ctx, testXPub, utils.ChainExternal, utils.ScriptTypePubKeyHash, opts...,
 			)
 			assert.NoError(t, err)
 			assert.Equal(t, "fc1e635d98151c6008f29908ee2928c60c745266f9853e945c917b1baa05973e", destination.ID)
@@ -42,7 +42,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_NewDestination() {
 			assert.Equal(t, "test-value", destination.Metadata["test-key"])
 
 			destination2, err2 := tc.client.NewDestination(
-				ctx, testXPub, utils.ChainExternal, utils.ScriptTypePubKeyHash, false, opts...,
+				ctx, testXPub, utils.ChainExternal, utils.ScriptTypePubKeyHash, opts...,
 			)
 			assert.NoError(t, err2)
 			assert.Equal(t, testXPubID, destination2.XpubID)
@@ -65,7 +65,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_NewDestination() {
 
 			destination, err := tc.client.NewDestination(
 				context.Background(), testXPub, utils.ChainExternal,
-				utils.ScriptTypePubKeyHash, false, opts...,
+				utils.ScriptTypePubKeyHash, opts...,
 			)
 			require.Error(t, err)
 			require.Nil(t, destination)
@@ -99,7 +99,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_NewDestinationForLockingScript() {
 
 			var destination *Destination
 			destination, err = tc.client.NewDestinationForLockingScript(
-				tc.ctx, testXPubID, lockingScript, false, opts...,
+				tc.ctx, testXPubID, lockingScript, opts...,
 			)
 			assert.NoError(t, err)
 			assert.Equal(t, "a64c7aca7110c7cde92245252a58bb18a4317381fc31fc293f6aafa3fcc7019f", destination.ID)
@@ -118,7 +118,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_NewDestinationForLockingScript() {
 			opts := append(tc.client.DefaultModelOptions(), WithMetadatas(metadata))
 
 			destination, err := tc.client.NewDestinationForLockingScript(
-				tc.ctx, testXPubID, "", false,
+				tc.ctx, testXPubID, "",
 				opts...,
 			)
 			require.Error(t, err)
@@ -147,7 +147,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_GetDestinations() {
 
 			// Create a new destination
 			destination, err := tc.client.NewDestination(
-				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash, false,
+				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash,
 				opts...,
 			)
 			require.NoError(t, err)
@@ -176,7 +176,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_GetDestinations() {
 
 			// Create a new destination
 			destination, err := tc.client.NewDestination(
-				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash, false,
+				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash,
 				opts...,
 			)
 			require.NoError(t, err)
@@ -212,7 +212,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_GetDestinationByAddress() {
 
 			// Create a new destination
 			destination, err := tc.client.NewDestination(
-				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash, false,
+				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash,
 				opts...,
 			)
 			require.NoError(t, err)
@@ -240,7 +240,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_GetDestinationByAddress() {
 
 			// Create a new destination
 			destination, err := tc.client.NewDestination(
-				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash, false,
+				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash,
 				opts...,
 			)
 			require.NoError(t, err)
@@ -276,7 +276,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_GetDestinationByLockingScript() {
 
 			// Create a new destination
 			destination, err := tc.client.NewDestination(
-				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash, false,
+				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash,
 				opts...,
 			)
 			require.NoError(t, err)
@@ -305,7 +305,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_GetDestinationByLockingScript() {
 
 			// Create a new destination
 			destination, err := tc.client.NewDestination(
-				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash, false,
+				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash,
 				opts...,
 			)
 			require.NoError(t, err)
@@ -340,7 +340,7 @@ func (ts *EmbeddedDBTestSuite) TestClient_UpdateDestinationMetadata() {
 			opts := tc.client.DefaultModelOptions()
 			opts = append(opts, WithMetadatas(metadata))
 			destination, err := tc.client.NewDestination(
-				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash, false,
+				tc.ctx, rawKey, utils.ChainExternal, utils.ScriptTypePubKeyHash,
 				opts...,
 			)
 			require.NoError(t, err)

diff --git a/action_transaction.go b/action_transaction.go
@@ -46,13 +46,7 @@ func (c *Client) RecordRawTransaction(ctx context.Context, txHex string,
 ) (*Transaction, error) {
 	ctx = c.GetOrStartTxn(ctx, "record_raw_transaction")
 
-	allowUnknown := true
-	monitor := c.options.chainstate.Monitor()
-	if monitor != nil {
-		allowUnknown = monitor.AllowUnknownTransactions()
-	}
-
-	return saveRawTransaction(ctx, c, allowUnknown, txHex, opts...)
+	return saveRawTransaction(ctx, c, true, txHex, opts...)
 }
 
 // NewTransaction will create a new draft transaction and return it

diff --git a/bux_suite_test.go b/bux_suite_test.go
@@ -3,12 +3,12 @@ package bux
 import (
 	"context"
 	"fmt"
+	"github.com/rs/zerolog"
 	"sync"
 	"testing"
 	"time"
 
 	"github.com/BuxOrg/bux/chainstate"
-	"github.com/BuxOrg/bux/logging"
 	"github.com/BuxOrg/bux/taskmanager"
 	"github.com/BuxOrg/bux/tester"
 	"github.com/DATA-DOG/go-sqlmock"
@@ -68,7 +68,7 @@ type EmbeddedDBTestSuite struct {
 func (ts *EmbeddedDBTestSuite) serveMySQL() {
 	defer ts.wg.Done()
 
-	logger := logging.GetDefaultLogger()
+	logger := zerolog.Nop()
 
 	for {
 		err := ts.MySQLServer.Start()

diff --git a/chainstate/chainstate.go b/chainstate/chainstate.go
@@ -9,11 +9,6 @@ import (
 	"time"
 )
 
-// MonitorBlockHeaders will start up a block headers monitor
-func (c *Client) MonitorBlockHeaders(_ context.Context) error {
-	return nil
-}
-
 // Broadcast will attempt to broadcast a transaction using the given providers
 func (c *Client) Broadcast(ctx context.Context, id, txHex string, timeout time.Duration) (string, error) {
 	// Basic validation

diff --git a/chainstate/client.go b/chainstate/client.go
@@ -26,7 +26,6 @@ type (
 		config          *syncConfig     // Configuration for broadcasting and other chain-state actions
 		debug           bool            // For extra logs and additional debug information
 		logger          *zerolog.Logger // Logger interface
-		monitor         MonitorService  // Monitor service
 		newRelicEnabled bool            // If NewRelic is enabled (parent application)
 		userAgent       string          // Custom user agent for outgoing HTTP Requests
 	}
@@ -100,11 +99,6 @@ func (c *Client) Close(ctx context.Context) {
 			c.options.config.minercraft = nil
 		}
 
-		// Stop the active Monitor (if not already stopped)
-		if c.options.monitor != nil {
-			_ = c.options.monitor.Stop(ctx)
-			c.options.monitor = nil
-		}
 	}
 }
 
@@ -143,11 +137,6 @@ func (c *Client) Minercraft() minercraft.ClientInterface {
 	return c.options.config.minercraft
 }
 
-// Monitor will return the Monitor client
-func (c *Client) Monitor() MonitorService {
-	return c.options.monitor
-}
-
 // BroadcastClient will return the BroadcastClient client
 func (c *Client) BroadcastClient() broadcast.Client {
 	return c.options.config.broadcastClient

diff --git a/chainstate/client_options.go b/chainstate/client_options.go
@@ -122,25 +122,6 @@ func WithLogger(customLogger *zerolog.Logger) ClientOps {
 	}
 }
 
-// WithMonitoring will create a new monitorConfig interface with the given options
-func WithMonitoring(ctx context.Context, monitorOptions *MonitorOptions) ClientOps {
-	return func(c *clientOptions) {
-		if monitorOptions != nil {
-			// Create the default Monitor for monitoring destinations
-			c.monitor = NewMonitor(ctx, monitorOptions)
-		}
-	}
-}
-
-// WithMonitoringInterface will set the interface to use for monitoring the blockchain
-func WithMonitoringInterface(monitor MonitorService) ClientOps {
-	return func(c *clientOptions) {
-		if monitor != nil {
-			c.monitor = monitor
-		}
-	}
-}
-
 // WithExcludedProviders will set a list of excluded providers
 func WithExcludedProviders(providers []string) ClientOps {
 	return func(c *clientOptions) {

diff --git a/chainstate/definitions.go b/chainstate/definitions.go
@@ -10,7 +10,6 @@ const (
 	defaultFalsePositiveRate       = 0.01
 	defaultFeeLastCheckIgnore      = 2 * time.Minute
 	defaultMaxNumberOfDestinations = 100000
-	defaultMonitorDays             = 7
 	defaultQueryTimeOut            = 15 * time.Second
 	whatsOnChainRateLimitWithKey   = 20
 )

diff --git a/chainstate/errors.go b/chainstate/errors.go
@@ -22,6 +22,3 @@ var ErrMissingBroadcastMiners = errors.New("missing: broadcasting miners")
 
 // ErrMissingQueryMiners is when query miners are missing
 var ErrMissingQueryMiners = errors.New("missing: query miners")
-
-// ErrMonitorNotAvailable is when the monitor processor is not available
-var ErrMonitorNotAvailable = errors.New("monitor processor not available")
diff --git a/chainstate/interface.go b/chainstate/interface.go
@@ -8,8 +8,6 @@ import (
 	"github.com/BuxOrg/bux/utils"
 	"github.com/bitcoin-sv/go-broadcast-client/broadcast"
 	"github.com/centrifugal/centrifuge-go"
-	"github.com/libsv/go-bc"
-	"github.com/rs/zerolog"
 	"github.com/tonicpow/go-minercraft/v2"
 )
 
@@ -51,64 +49,11 @@ type ClientInterface interface {
 	HTTPClient() HTTPInterface
 	IsDebug() bool
 	IsNewRelicEnabled() bool
-	Monitor() MonitorService
 	Network() Network
 	QueryTimeout() time.Duration
 	FeeUnit() *utils.FeeUnit
 }
 
-// MonitorClient interface
-type MonitorClient interface {
-	AddFilter(regex, item string) (centrifuge.PublishResult, error)
-	Connect() error
-	Disconnect() error
-	SetToken(token string)
-}
-
-// MonitorHandler interface
-type MonitorHandler interface {
-	SocketHandler
-	RecordBlockHeader(ctx context.Context, bh bc.BlockHeader) error
-	RecordTransaction(ctx context.Context, txHex string) error
-	SetMonitor(monitor *Monitor)
-}
-
-// MonitorProcessor struct that defines interface to all filter processors
-type MonitorProcessor interface {
-	Add(regexString, item string) error
-	Debug(bool)
-	FilterTransaction(txHex string) (string, error)
-	FilterTransactionPublishEvent(eData []byte) (string, error)
-	GetFilters() map[string]*BloomProcessorFilter
-	GetHash() string
-	IsDebug() bool
-	Logger() *zerolog.Logger
-	Reload(regexString string, items []string) error
-	SetFilter(regex string, filter []byte) error
-	SetLogger(logger *zerolog.Logger)
-	Test(regexString string, item string) bool
-}
-
-// MonitorService for the monitoring
-type MonitorService interface {
-	Add(regexpString string, item string) error
-	Connected()
-	Disconnected()
-	GetFalsePositiveRate() float64
-	GetLockID() string
-	GetMaxNumberOfDestinations() int
-	GetMonitorDays() int
-	IsConnected() bool
-	IsDebug() bool
-	LoadMonitoredDestinations() bool
-	AllowUnknownTransactions() bool
-	Logger() *zerolog.Logger
-	Processor() MonitorProcessor
-	SaveDestinations() bool
-	Start(ctx context.Context, handler MonitorHandler, onStop func()) error
-	Stop(ctx context.Context) error
-}
-
 // SocketHandler is composite interface of centrifuge handlers interfaces
 type SocketHandler interface {
 	OnConnect(*centrifuge.Client, centrifuge.ConnectEvent)