feat(BUX-172): update go-paymail dependency

BuxOrg · Nov 24, 2023 · 17197d5 · 17197d5
1 parent 4b91c0f
commit 17197d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/chainstate/merkle_root_provider.go b/chainstate/merkle_root_provider.go
@@ -26,14 +26,14 @@ const (
 // of Merkle Roots inclusion in the longest chain.
 type MerkleRootConfirmationRequestItem struct {
 	MerkleRoot  string `json:"merkleRoot"`
-	BlockHeight int32  `json:"blockHeight"`
+	BlockHeight uint64 `json:"blockHeight"`
 }
 
 // MerkleRootConfirmation is a confirmation
 // of merkle roots inclusion in the longest chain.
 type MerkleRootConfirmation struct {
 	Hash         string                      `json:"blockHash"`
-	BlockHeight  int32                       `json:"blockHeight"`
+	BlockHeight  uint64                      `json:"blockHeight"`
 	MerkleRoot   string                      `json:"merkleRoot"`
 	Confirmation MerkleRootConfirmationState `json:"confirmation"`
 }

diff --git a/definitions.go b/definitions.go
@@ -24,7 +24,7 @@ const (
 	dustLimit                      = uint64(1)         // Dust limit
 	mongoTestVersion               = "6.0.4"           // Mongo Testing Version
 	sqliteTestVersion              = "3.37.0"          // SQLite Testing Version (dummy version for now)
-	version                        = "v0.6.0"          // bux version
+	version                        = "v0.6.1"          // bux version
 )
 
 // Defaults for task cron jobs (tasks)

diff --git a/paymail_mocks_test.go b/paymail_mocks_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/bitcoin-sv/go-paymail"
 	"github.com/bitcoin-sv/go-paymail/server"
+	"github.com/bitcoin-sv/go-paymail/spv"
 )
 
 // Mock implementation of a service provider
@@ -43,7 +44,7 @@ func (m *mockServiceProvider) RecordTransaction(_ context.Context,
 }
 
 // RecordTransaction is a demo implementation of this interface
-func (m *mockServiceProvider) VerifyMerkleRoots(_ context.Context, _ []paymail.MerkleRootConfirmationRequestItem) error {
+func (m *mockServiceProvider) VerifyMerkleRoots(_ context.Context, _ []*spv.MerkleRootConfirmationRequestItem) error {
 
 	// Verify merkle roots
 	return nil

diff --git a/paymail_service_provider.go b/paymail_service_provider.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/bitcoin-sv/go-paymail"
 	"github.com/bitcoin-sv/go-paymail/server"
+	"github.com/bitcoin-sv/go-paymail/spv"
 	"github.com/bitcoinschema/go-bitcoin/v2"
 	"github.com/libsv/go-bk/bec"
 	customTypes "github.com/mrz1836/go-datastore/custom_types"
@@ -182,7 +183,7 @@ func (p *PaymailDefaultServiceProvider) RecordTransaction(ctx context.Context,
 // VerifyMerkleRoots will verify the merkle roots by checking them in external header service - Pulse
 func (p *PaymailDefaultServiceProvider) VerifyMerkleRoots(
 	ctx context.Context,
-	merkleRoots []paymail.MerkleRootConfirmationRequestItem,
+	merkleRoots []*spv.MerkleRootConfirmationRequestItem,
 ) error {
 	request := make([]chainstate.MerkleRootConfirmationRequestItem, 0)
 	for _, m := range merkleRoots {