rectify ws_url not being written to storage

Author: aruokhai

pkg/client-sdk/base_client.go

@@ -370,6 +370,7 @@ func (a *arkClient) init(
 		BoardingExitDelay:          common.RelativeLocktime{Type: boardingExitDelayType, Value: uint32(info.BoardingExitDelay)},
 		BoardingDescriptorTemplate: info.BoardingDescriptorTemplate,
 		ExplorerURL:                explorerSvc.BaseUrl(),
+		ExplorerWSURL:              args.ExplorerWSURL,
 		ForfeitAddress:             info.ForfeitAddress,
 		WithTransactionFeed:        args.WithTransactionFeed,
 		MarketHourStartTime:        info.MarketHourStartTime,

pkg/client-sdk/client.go

@@ -1048,7 +1048,7 @@ func (a *covenantlessArkClient) getTransaction(ctx context.Context, txId string)
 }
 
 func (a *covenantlessArkClient) listenWebsocketBoardingTxns(ctx context.Context) {
-	// try to add existing boarding utxos if present
+	// try to add existing boarding utxos if present during initialization
 	_, boardingAddresses, _, err := a.wallet.GetAddresses(ctx)
 	if err == nil {
 		for _, boardingAddress := range boardingAddresses {
@@ -1060,7 +1060,7 @@ func (a *covenantlessArkClient) listenWebsocketBoardingTxns(ctx context.Context)
 
 	err = a.explorer.ListenAddresses(func(boaringUtxos, mempoolUtxos []explorer.WSUtxo) error {
 		if len(mempoolUtxos) > 0 {
-			newPendingBoardingTxs := make([]types.Transaction, 0)
+			newPendingBoardingTxs := make([]types.Transaction, len(mempoolUtxos))
 			createdAt := time.Now()
 
 			for _, u := range mempoolUtxos {
@@ -1090,6 +1090,8 @@ func (a *covenantlessArkClient) listenWebsocketBoardingTxns(ctx context.Context)
 						}
 					}
 
+					log.WithField("rbFTransactions", rbfTransactions).Debugf("replacing %d boarding transaction(s) with rbf transactions", len(rbfTransactions))
+
 					count, err := a.store.TransactionStore().RbfTransactions(ctx, rbfTransactions)
 					if err != nil {
 						log.WithError(err).Error("failed to update rbf boarding transactions")
@@ -1100,6 +1102,8 @@ func (a *covenantlessArkClient) listenWebsocketBoardingTxns(ctx context.Context)
 					continue
 				}
 
+				log.WithField("mempool_txid", u.Txid).Infof("new boarding transaction %s", u.Txid)
+
 				newPendingBoardingTxs = append(newPendingBoardingTxs, types.Transaction{
 					TransactionKey: types.TransactionKey{
 						BoardingTxid: u.Txid,
@@ -1130,6 +1134,30 @@ func (a *covenantlessArkClient) listenWebsocketBoardingTxns(ctx context.Context)
 			)
 			if err != nil {
 				log.WithError(err).Error("failed to update boarding transactions")
+				return err
+			}
+			// ensure that we add transactions that were not in memepool
+			// but were confirmed in the blockchain
+			if count != len(boaringUtxos) {
+				newPendingBoardingTxs := make([]types.Transaction, len(boaringUtxos))
+				for _, u := range boaringUtxos {
+					newPendingBoardingTxs = append(newPendingBoardingTxs, types.Transaction{
+						TransactionKey: types.TransactionKey{
+							BoardingTxid: u.Txid,
+						},
+						Amount:    u.Value,
+						Type:      types.TxReceived,
+						CreatedAt: time.Now(),
+					})
+				}
+				count, err = a.store.TransactionStore().AddTransactions(
+					ctx, newPendingBoardingTxs,
+				)
+				if err != nil {
+					log.WithError(err).Error("failed to add new boarding transactions")
+					return err
+				}
+
 			}
 			log.Debugf("confirmed %d boarding transaction(s)", count)
 		}

pkg/client-sdk/store/file/config_store.go

@@ -64,6 +64,7 @@ func (s *configStore) AddData(ctx context.Context, data types.Config) error {
 		Dust:                       fmt.Sprintf("%d", data.Dust),
 		BoardingDescriptorTemplate: data.BoardingDescriptorTemplate,
 		ExplorerURL:                data.ExplorerURL,
+		ExplorerWSURL:              data.ExplorerWSURL,
 		ForfeitAddress:             data.ForfeitAddress,
 		WithTransactionFeed:        strconv.FormatBool(data.WithTransactionFeed),
 		MarketHourStartTime:        fmt.Sprintf("%d", data.MarketHourStartTime),

pkg/client-sdk/store/file/types.go

@@ -23,6 +23,7 @@ type storeData struct {
 	BoardingExitDelay          string `json:"boarding_exit_delay"`
 	BoardingDescriptorTemplate string `json:"boarding_descriptor_template"`
 	ExplorerURL                string `json:"explorer_url"`
+	ExplorerWSURL              string `json:"explorer_ws_url"`
 	ForfeitAddress             string `json:"forfeit_address"`
 	WithTransactionFeed        string `json:"with_transaction_feed"`
 	MarketHourStartTime        string `json:"market_hour_start_time"`
@@ -55,6 +56,7 @@ func (d storeData) decode() types.Config {
 	buf, _ := hex.DecodeString(d.ServerPubKey)
 	serverPubkey, _ := secp256k1.ParsePubKey(buf)
 	explorerURL := d.ExplorerURL
+	explorerWSURL := d.ExplorerWSURL
 	nextStartTime, _ := strconv.Atoi(d.MarketHourStartTime)
 	nextEndTime, _ := strconv.Atoi(d.MarketHourEndTime)
 	period, _ := strconv.Atoi(d.MarketHourPeriod)
@@ -92,6 +94,7 @@ func (d storeData) decode() types.Config {
 		BoardingExitDelay:          common.RelativeLocktime{Type: boardingExitDelayType, Value: uint32(boardingExitDelay)},
 		BoardingDescriptorTemplate: d.BoardingDescriptorTemplate,
 		ExplorerURL:                explorerURL,
+		ExplorerWSURL:              explorerWSURL,
 		ForfeitAddress:             d.ForfeitAddress,
 		WithTransactionFeed:        withTransactionFeed,
 		MarketHourStartTime:        int64(nextStartTime),
@@ -119,6 +122,7 @@ func (d storeData) asMap() map[string]string {
 		"boarding_exit_delay":          d.BoardingExitDelay,
 		"boarding_descriptor_template": d.BoardingDescriptorTemplate,
 		"explorer_url":                 d.ExplorerURL,
+		"explorer_ws_url":              d.ExplorerWSURL,
 		"forfeit_address":              d.ForfeitAddress,
 		"with_transaction_feed":        d.WithTransactionFeed,
 		"market_hour_start_time":       d.MarketHourStartTime,