feat(BUX-368): arc callbacks

.gitignore

@@ -21,6 +21,9 @@ go.list
 # Jetbrains
 .idea/
 
+#VSCode
+.vscode/
+
 # Eclipse
 .project
 

action_destination.go

@@ -2,18 +2,14 @@
 
 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 @@
 		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 @@
 
 // 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 @@
 		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 @@
 		}}
 	}
 
+=======
+>>>>>>> 06feaba (feat(BUX-417): remove monitor, ITC flag and IncomingTransaction (#532))
 	// Save the destination
 	if err := destination.Save(ctx); err != nil {
 		return nil, err

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)

action_transaction.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/BuxOrg/bux/chainstate"
 	"github.com/BuxOrg/bux/utils"
+	"github.com/bitcoin-sv/go-broadcast-client/broadcast"
+	"github.com/libsv/go-bc"
 	"github.com/libsv/go-bt"
 	"github.com/mrz1836/go-datastore"
 )
@@ -46,13 +48,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
@@ -387,6 +383,39 @@ func (c *Client) RevertTransaction(ctx context.Context, id string) error {
 	return err
 }
 
+// UpdateTransaction will update the broadcast callback transaction info, like: block height, block hash, status, bump.
+func (c *Client) UpdateTransaction(ctx context.Context, callbackResp *broadcast.SubmittedTx) error {
+	bump, err := bc.NewBUMPFromStr(callbackResp.MerklePath)
+	if err != nil {
+		c.options.logger.Err(err).Msgf("failed to parse merkle path from broadcast callback - tx: %v", callbackResp)
+		return err
+	}
+
+	txInfo := &chainstate.TransactionInfo{
+		BlockHash:   callbackResp.BlockHash,
+		BlockHeight: callbackResp.BlockHeight,
+		ID:          callbackResp.TxID,
+		TxStatus:    callbackResp.TxStatus,
+		BUMP:        bump,
+		// it's not possible to get confirmations from broadcast client; zero would be treated as "not confirmed" that's why -1
+		Confirmations: -1,
+	}
+
+	tx, err := c.GetTransaction(ctx, "", txInfo.ID)
+	if err != nil {
+		c.options.logger.Err(err).Msgf("failed to get transaction by id: %v", txInfo.ID)
+		return err
+	}
+
+	syncTx, err := GetSyncTransactionByTxID(ctx, txInfo.ID, c.DefaultModelOptions()...)
+	if err != nil {
+		c.options.logger.Err(err).Msgf("failed to get sync transaction by tx id: %v", txInfo.ID)
+		return err
+	}
+
+	return processSyncTxSave(ctx, txInfo, syncTx, tx)
+}
+
 func generateTxIDFilterConditions(txIDs []string) *map[string]interface{} {
 	orConditions := make([]map[string]interface{}, len(txIDs))
 

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()