From 8d4de5bd1a0853aab283d1a48c5ae653594f5a04 Mon Sep 17 00:00:00 2001
From: mrz1836 <mrz1818@gmail.com>
Date: Tue, 17 May 2022 13:57:48 -0400
Subject: [PATCH] Make sure the xpub exists for the paymail

---
 action_paymails.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/action_paymails.go b/action_paymails.go
index 9b779d05..757420b4 100644
--- a/action_paymails.go
+++ b/action_paymails.go
@@ -95,6 +95,12 @@ func (c *Client) NewPaymailAddress(ctx context.Context, xPubKey, address, public
 	// Check for existing NewRelic transaction
 	ctx = c.GetOrStartTxn(ctx, "new_paymail_address")
 
+	// Get the xPub (make sure it exists)
+	_, err := c.GetXpub(ctx, xPubKey)
+	if err != nil {
+		return nil, err
+	}
+
 	// Start the new paymail address model
 	paymailAddress := newPaymail(
 		address,
@@ -109,10 +115,9 @@ func (c *Client) NewPaymailAddress(ctx context.Context, xPubKey, address, public
 	paymailAddress.PublicName = publicName
 
 	// Save the model
-	if err := paymailAddress.Save(ctx); err != nil {
+	if err = paymailAddress.Save(ctx); err != nil {
 		return nil, err
 	}
-
 	return paymailAddress, nil
 }