Merge remote-tracking branch 'upstream/master' into pr-190

rohenaz · rohenaz · commit de56e637b80a · 2025-06-30T09:14:55.000-04:00
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -47,7 +47,7 @@ jobs:
           args: --timeout=5m --issues-exit-code=0 --output.checkstyle.path=golangci-lint-report.xml
 
       - name: SonarCloud Scan
-        uses: SonarSource/sonarqube-scan-action@v5.0.0
+        uses: SonarSource/sonarqube-scan-action@v5.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.golangci.yml b/.golangci.yml
@@ -5,4 +5,7 @@ linters:
     rules:
       - linters:
           - staticcheck
-        text: "SA1019:"
+        text: "SA1019:"
+      - linters:
+          - errcheck
+        text: "Error return value of `.*\\.Close` is not checked"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file. The format
 
 ## Table of Contents
 
-- [1.2.2 - 2025-06-30](#122---2025-06-30)
+- [1.2.3 - 2025-06-30](#123---2025-06-30)
+- [1.2.2 - 2025-06-27](#122---2025-06-27)
 - [1.2.1 - 2025-06-12](#121---2025-06-12)
 - [1.2.0 - 2025-06-10](#120---2025-06-10)
 - [1.1.27 - 2025-05-15](#1127---2025-05-15)
@@ -37,7 +38,7 @@ All notable changes to this project will be documented in this file. The format
 - [1.1.0 - 2024-08-19](#110---2024-08-19)
 - [1.0.0 - 2024-06-06](#100---2024-06-06)
 
-## [1.2.2] - 2025-06-30
+## [1.2.3] - 2025-06-30
 
 ### Fixed
 - Fixed an encoding bug in peer authentication
@@ -46,6 +47,12 @@ All notable changes to this project will be documented in this file. The format
 - Improved error handling consistency using `NewAuthError`
 - Fixed variable naming consistency
 
+## [1.2.2] - 2025-06-27
+### Added
+- New `CurrentHeight` function on chaintracker interface
+
+### Fixed
+- Update type `wallet.Action.Satoshis` from `uint64` to `int64`
 
 ## [1.2.1] - 2025-06-12
 
diff --git a/README.md b/README.md
@@ -3,7 +3,11 @@
 Welcome to the BSV Blockchain Libraries Project, the comprehensive Go SDK designed to provide an updated and unified layer for developing scalable applications on the BSV Blockchain. This SDK addresses the limitations of previous tools by offering a fresh, peer-to-peer approach, adhering to SPV, and ensuring privacy and scalability.
 
 # Status
-![golangci-lint](https://github.com/bsv-blockchain/go-sdk/workflows/golangci-lint/badge.svg)
+[![CodeQL](https://github.com/bsv-blockchain/go-sdk/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/bsv-blockchain/go-sdk/actions/workflows/github-code-scanning/codeql)
+[![Dependabot Updates](https://github.com/bsv-blockchain/go-sdk/actions/workflows/dependabot/dependabot-updates/badge.svg)](https://github.com/bsv-blockchain/go-sdk/actions/workflows/dependabot/dependabot-updates)
+[![golangci-lint](https://github.com/bsv-blockchain/go-sdk/actions/workflows/golangci-lint.yaml/badge.svg)](https://github.com/bsv-blockchain/go-sdk/actions/workflows/golangci-lint.yaml)
+[![pages-build-deployment](https://github.com/bsv-blockchain/go-sdk/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/bsv-blockchain/go-sdk/actions/workflows/pages/pages-build-deployment)
+[![sonarcloud-analysis](https://github.com/bsv-blockchain/go-sdk/actions/workflows/sonar.yaml/badge.svg)](https://github.com/bsv-blockchain/go-sdk/actions/workflows/sonar.yaml)
 
 ## Table of Contents
 
diff --git a/auth/transports/simplified_http_transport.go b/auth/transports/simplified_http_transport.go
@@ -66,7 +66,7 @@ func (t *SimplifiedHTTPTransport) Send(ctx context.Context, message *auth.AuthMe
 		if err != nil {
 			return fmt.Errorf("failed to perform proxied HTTP request: %w", err)
 		}
-		defer func() { _ = resp.Body.Close() }()
+		defer resp.Body.Close()
 
 		// Step 3: Serialize the response as an AuthMessage and notify handlers
 		respPayloadWriter := util.NewWriter()
@@ -114,7 +114,7 @@ func (t *SimplifiedHTTPTransport) Send(ctx context.Context, message *auth.AuthMe
 	if err != nil {
 		return fmt.Errorf("failed to send HTTP request: %w", err)
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		body, _ := io.ReadAll(resp.Body)
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	golang.org/x/sync v0.15.0
 )
 
-require golang.org/x/net v0.39.0
+require golang.org/x/net v0.41.0
 
 require (
 	github.com/pkg/errors v0.9.1
diff --git a/go.sum b/go.sum
@@ -8,8 +8,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
 golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
 golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
diff --git a/overlay/lookup/facilitator.go b/overlay/lookup/facilitator.go
@@ -34,7 +34,7 @@ func (f *HTTPSOverlayLookupFacilitator) Lookup(ctx context.Context, url string,
 		if err != nil {
 			return nil, err
 		}
-		defer func() { _ = resp.Body.Close() }()
+		defer resp.Body.Close()
 		if resp.StatusCode != http.StatusOK {
 			return nil, &util.HTTPError{
 				StatusCode: resp.StatusCode,
diff --git a/overlay/topic/facilitator.go b/overlay/topic/facilitator.go
@@ -42,7 +42,7 @@ func (f *HTTPSOverlayBroadcastFacilitator) Send(url string, taggedBEEF *overlay.
 		if err != nil {
 			return nil, err
 		}
-		defer func() { _ = resp.Body.Close() }()
+		defer resp.Body.Close()
 		if resp.StatusCode != http.StatusOK {
 			return nil, &util.HTTPError{
 				StatusCode: resp.StatusCode,
diff --git a/spv/scripts_only.go b/spv/scripts_only.go
@@ -1,10 +1,18 @@
 package spv
 
-import "github.com/bsv-blockchain/go-sdk/chainhash"
+import (
+	"context"
+
+	"github.com/bsv-blockchain/go-sdk/chainhash"
+)
 
 type GullibleHeadersClient struct{}
 
 func (g *GullibleHeadersClient) IsValidRootForHeight(merkleRoot *chainhash.Hash, height uint32) (bool, error) {
 	// DO NOT USE IN A REAL PROJECT due to security risks of accepting any merkle root as valid without verification
 	return true, nil
 }
+
+func (g *GullibleHeadersClient) CurrentHeight(ctx context.Context) (uint32, error) {
+	return 800000, nil // Return a dummy height for testing
+}
diff --git a/storage/uploader.go b/storage/uploader.go
@@ -96,7 +96,7 @@ func (u *Uploader) getUploadInfo(ctx context.Context, fileSize int, retentionPer
 	if err != nil {
 		return nil, fmt.Errorf("failed to get upload info: %w", err)
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("upload info request failed: HTTP %d", resp.StatusCode)
@@ -136,7 +136,7 @@ func (u *Uploader) uploadFile(ctx context.Context, uploadURL string, file Upload
 	if err != nil {
 		return UploadFileResult{}, fmt.Errorf("file upload failed: %w", err)
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		bodyBytes, _ := io.ReadAll(resp.Body)
@@ -193,7 +193,7 @@ func (u *Uploader) FindFile(ctx context.Context, uhrpURL string) (FindFileData,
 	if err != nil {
 		return FindFileData{}, fmt.Errorf("findFile request failed: %w", err)
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return FindFileData{}, fmt.Errorf("findFile request failed: HTTP %d", resp.StatusCode)
@@ -232,7 +232,7 @@ func (u *Uploader) ListUploads(ctx context.Context) (interface{}, error) {
 	if err != nil {
 		return nil, fmt.Errorf("listUploads request failed: %w", err)
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("listUploads request failed: HTTP %d", resp.StatusCode)
@@ -283,7 +283,7 @@ func (u *Uploader) RenewFile(ctx context.Context, uhrpURL string, additionalMinu
 	if err != nil {
 		return RenewFileResult{}, fmt.Errorf("renewFile request failed: %w", err)
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return RenewFileResult{}, fmt.Errorf("renewFile request failed: HTTP %d", resp.StatusCode)
diff --git a/transaction/broadcaster/arc.go b/transaction/broadcaster/arc.go
@@ -145,7 +145,7 @@ func (a *Arc) BroadcastCtx(ctx context.Context, t *transaction.Transaction) (*tr
 			Description: err.Error(),
 		}
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 	msg, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, &transaction.BroadcastFailure{
@@ -208,7 +208,7 @@ func (a *Arc) Status(txid string) (*ArcResponse, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 	msg, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
diff --git a/transaction/broadcaster/taal.go b/transaction/broadcaster/taal.go
@@ -56,7 +56,7 @@ func (b *TAALBroadcast) BroadcastCtx(ctx context.Context, t *transaction.Transac
 			Description: err.Error(),
 		}
 	} else {
-		defer resp.Body.Close() //nolint:errcheck // standard http client pattern
+		defer resp.Body.Close()
 		var taalResp TAALResponse
 		if err := json.NewDecoder(resp.Body).Decode(&taalResp); err != nil {
 			return nil, &transaction.BroadcastFailure{
diff --git a/transaction/broadcaster/woc.go b/transaction/broadcaster/woc.go
@@ -80,7 +80,7 @@ func (b *WhatsOnChain) BroadcastCtx(ctx context.Context, t *transaction.Transact
 				Description: err.Error(),
 			}
 		} else {
-			defer resp.Body.Close() //nolint:errcheck // standard http client pattern
+			defer resp.Body.Close()
 			if resp.StatusCode != 200 {
 				if body, err := io.ReadAll(resp.Body); err != nil {
 					return nil, &transaction.BroadcastFailure{
diff --git a/transaction/chaintracker/chaintracker.go b/transaction/chaintracker/chaintracker.go
@@ -1,7 +1,12 @@
 package chaintracker
 
-import "github.com/bsv-blockchain/go-sdk/chainhash"
+import (
+	"context"
+
+	"github.com/bsv-blockchain/go-sdk/chainhash"
+)
 
 type ChainTracker interface {
 	IsValidRootForHeight(root *chainhash.Hash, height uint32) (bool, error)
+	CurrentHeight(ctx context.Context) (uint32, error)
 }
diff --git a/transaction/chaintracker/headers_client/headers_client.go b/transaction/chaintracker/headers_client/headers_client.go
@@ -59,7 +59,7 @@ func (c Client) IsValidRootForHeight(root *chainhash.Hash, height uint32) (bool,
 	if err != nil {
 		return false, fmt.Errorf("error sending request: %v", err)
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
@@ -90,7 +90,7 @@ func (c *Client) BlockByHeight(ctx context.Context, height uint32) (*Header, err
 	if res, err := client.Do(req); err != nil {
 		return nil, err
 	} else {
-		defer func() { _ = res.Body.Close() }()
+		defer res.Body.Close()
 		if err := json.NewDecoder(res.Body).Decode(&headers); err != nil {
 			return nil, err
 		}
@@ -119,7 +119,7 @@ func (c *Client) GetBlockState(ctx context.Context, hash string) (*State, error)
 	if res, err := client.Do(req); err != nil {
 		return nil, err
 	} else {
-		defer func() { _ = res.Body.Close() }()
+		defer res.Body.Close()
 		if err := json.NewDecoder(res.Body).Decode(headerState); err != nil {
 			return nil, err
 		}
@@ -138,10 +138,18 @@ func (c *Client) GetChaintip(ctx context.Context) (*State, error) {
 	if res, err := client.Do(req); err != nil {
 		return nil, err
 	} else {
-		defer func() { _ = res.Body.Close() }()
+		defer res.Body.Close()
 		if err := json.NewDecoder(res.Body).Decode(headerState); err != nil {
 			return nil, err
 		}
 	}
 	return headerState, nil
 }
+
+func (c *Client) CurrentHeight(ctx context.Context) (uint32, error) {
+	tip, err := c.GetChaintip(ctx)
+	if err != nil {
+		return 0, err
+	}
+	return tip.Height, nil
+}
diff --git a/transaction/chaintracker/whatsonchain.go b/transaction/chaintracker/whatsonchain.go
@@ -34,6 +34,10 @@ type WhatsOnChain struct {
 	client  *http.Client
 }
 
+type ChainInfo struct {
+	Blocks uint32 `json:"blocks"`
+}
+
 func NewWhatsOnChain(network Network, apiKey string) *WhatsOnChain {
 	return &WhatsOnChain{
 		Network: network,
@@ -57,7 +61,7 @@ func (w *WhatsOnChain) GetBlockHeader(height uint32) (header *BlockHeader, err e
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	if resp.StatusCode == http.StatusNotFound {
 		return nil, nil
@@ -81,3 +85,34 @@ func (w *WhatsOnChain) IsValidRootForHeight(root *chainhash.Hash, height uint32)
 		return header.MerkleRoot.IsEqual(root), nil
 	}
 }
+
+// Assuming BlockHeader is defined elsewhere
+func (w *WhatsOnChain) CurrentHeight(ctx context.Context) (height uint32, err error) {
+	url := fmt.Sprintf("%s/chain/info", w.baseURL)
+	req, err := http.NewRequestWithContext(context.Background(), "GET", url, nil)
+	if err != nil {
+		return
+	}
+
+	req.Header.Set("Authorization", w.ApiKey)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusNotFound {
+		return 0, fmt.Errorf("chain info not found for network %s", w.Network)
+	}
+	if resp.StatusCode != http.StatusOK {
+		return 0, fmt.Errorf("failed to verify merkleroot for height %d: %v", height, resp.Status)
+	}
+
+	info := &ChainInfo{}
+	if err := json.NewDecoder(resp.Body).Decode(info); err != nil {
+		return 0, err
+	}
+
+	return info.Blocks, nil
+}
diff --git a/transaction/chaintracker/whatsonchain_test.go b/transaction/chaintracker/whatsonchain_test.go
@@ -176,3 +176,32 @@ func TestWhatsOnChainIsValidRootForHeightInvalidRoot(t *testing.T) {
 		t.Fatalf("expected isValid to be false, got true")
 	}
 }
+
+func TestWhatsOnChainCurrentHeight(t *testing.T) {
+	// Mock ChainInfo data
+	expectedBlocks := uint32(800000)
+
+	// Create a test server
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		info := &ChainInfo{Blocks: expectedBlocks}
+		err := json.NewEncoder(w).Encode(info)
+		require.NoError(t, err)
+	}))
+	defer ts.Close()
+
+	woc := &WhatsOnChain{
+		Network: "main",
+		ApiKey:  "testapikey",
+		baseURL: ts.URL,
+		client:  ts.Client(),
+	}
+
+	height, err := woc.CurrentHeight(t.Context())
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if height != expectedBlocks {
+		t.Fatalf("expected height %d, got %d", expectedBlocks, height)
+	}
+}
diff --git a/transaction/merklepath_test.go b/transaction/merklepath_test.go
@@ -1,6 +1,7 @@
 package transaction
 
 import (
+	"context"
 	"encoding/json"
 	"log"
 	"testing"
@@ -104,6 +105,10 @@ func (mct MyChainTracker) IsValidRootForHeight(root *chainhash.Hash, height uint
 	return root.String() == BRC74Root && height == BRC74JSON.BlockHeight, nil
 }
 
+func (mct MyChainTracker) CurrentHeight(ctx context.Context) (uint32, error) {
+	return 800000, nil // Return a dummy height for testing
+}
+
 func TestMerklePath_Verify(t *testing.T) {
 	t.Parallel()
 
diff --git a/wallet/interfaces.go b/wallet/interfaces.go
diff --git a/wallet/serializer/list_actions.go b/wallet/serializer/list_actions.go
diff --git a/wallet/substrates/http_wallet_json.go b/wallet/substrates/http_wallet_json.go
diff --git a/wallet/substrates/http_wallet_wire.go b/wallet/substrates/http_wallet_wire.go

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ require (`
`9`	`9`	`golang.org/x/sync v0.15.0`
`10`	`10`	`)`
`11`	`11`
`12`		`-require golang.org/x/net v0.39.0`
	`12`	`+require golang.org/x/net v0.41.0`
`13`	`13`
`14`	`14`	`require (`
`15`	`15`	`github.com/pkg/errors v0.9.1`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (f *HTTPSOverlayLookupFacilitator) Lookup(ctx context.Context, url string,`
`34`	`34`	`if err != nil {`
`35`	`35`	`return nil, err`
`36`	`36`	`}`
`37`		`- defer func() { _ = resp.Body.Close() }()`
	`37`	`+ defer resp.Body.Close()`
`38`	`38`	`if resp.StatusCode != http.StatusOK {`
`39`	`39`	`return nil, &util.HTTPError{`
`40`	`40`	`StatusCode: resp.StatusCode,`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (f HTTPSOverlayBroadcastFacilitator) Send(url string, taggedBEEF overlay.`
`42`	`42`	`if err != nil {`
`43`	`43`	`return nil, err`
`44`	`44`	`}`
`45`		`- defer func() { _ = resp.Body.Close() }()`
	`45`	`+ defer resp.Body.Close()`
`46`	`46`	`if resp.StatusCode != http.StatusOK {`
`47`	`47`	`return nil, &util.HTTPError{`
`48`	`48`	`StatusCode: resp.StatusCode,`