Merge pull request #538 from BuxOrg/fix-474-prevent-panics

fix(BUX-474): prevent panics in UnReserveUtxos and VerifyMerkleRoots

action_utxo.go

@@ -136,7 +136,7 @@ func (c *Client) UnReserveUtxos(ctx context.Context, xPubID, draftID string) err
 	// Check for existing NewRelic transaction
 	ctx = c.GetOrStartTxn(ctx, "unreserve_uxtos_by_draft_id")
 
-	return unReserveUtxos(ctx, xPubID, draftID)
+	return unReserveUtxos(ctx, xPubID, draftID, c.DefaultModelOptions()...)
 }
 
 // should this be optional in the results?

chainstate/merkle_root.go

@@ -8,6 +8,10 @@ import (
 
 // VerifyMerkleRoots will try to verify merkle roots with all available providers
 func (c *Client) VerifyMerkleRoots(ctx context.Context, merkleRoots []MerkleRootConfirmationRequestItem) error {
+	if c.options.config.pulseClient == nil {
+		c.options.logger.Warn().Msg("VerifyMerkleRoots is called even though no pulse client is configured; this likely indicates that the paymail capabilities have been cached.")
+		return errors.New("no pulse client found")
+	}
 	pulseProvider := createPulseProvider(c)
 	merkleRootsRes, err := pulseProvider.verifyMerkleRoots(ctx, c, merkleRoots)
 	if err != nil {