Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/main/github.com/bitcoi…
Browse files Browse the repository at this point in the history
…n-sv/spv-wallet/models-1.0.0-beta.14
  • Loading branch information
chris-4chain authored Jul 3, 2024
2 parents 3bb26f9 + 545095a commit 30b3202
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
uses: goreleaser/[email protected]
with:
distribution: goreleaser
version: latest
args: release --rm-dist --debug
version: v1
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
Expand Down
6 changes: 3 additions & 3 deletions .make/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ install-releaser: ## Install the GoReleaser application
release:: ## Full production release (creates release in Github)
@echo "releasing..."
@test $(github_token)
@export GITHUB_TOKEN=$(github_token) && goreleaser --rm-dist
@export GITHUB_TOKEN=$(github_token) && goreleaser --clean

release-test: ## Full production test release (everything except deploy)
@echo "creating a release test..."
@goreleaser --skip-publish --rm-dist
@goreleaser --skip-publish --clean

release-snap: ## Test the full release (build binaries)
@echo "creating a release snapshot..."
@goreleaser --snapshot --skip-publish --rm-dist
@goreleaser --snapshot --skip-publish --clean

replace-version: ## Replaces the version in HTML/JS (pre-deploy)
@echo "replacing version..."
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ go get -u github.com/bitcoin-sv/spv-wallet-go-client
## Documentation
View the generated [documentation](https://pkg.go.dev/github.com/bitcoin-sv/spv-wallet-go-client)

For in-depth information and guidance, please refer to the [SPV Wallet Documentation](https://bsvblockchain.gitbook.io/docs).
For in-depth information and guidance, please refer to the [SPV Wallet Documentation](https://docs.bsvblockchain.org/network-topology/applications/spv-wallet).

[![GoDoc](https://godoc.org/github.com/bitcoin-sv/spv-wallet-go-client?status.svg&style=flat&v=2)](https://pkg.go.dev/github.com/bitcoin-sv/spv-wallet-go-client)

Expand Down
2 changes: 1 addition & 1 deletion contacts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestContactActionsRouting(t *testing.T) {
})

t.Run("UpsertContact", func(t *testing.T) {
contact, err := client.UpsertContact(context.Background(), "test-id", "[email protected]", nil)
contact, err := client.UpsertContact(context.Background(), "test-id", "[email protected]", "", nil)
require.NoError(t, err)
require.NotNil(t, contact)
})
Expand Down
4 changes: 2 additions & 2 deletions http.go
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,8 @@ func (wc *WalletClient) GetContacts(ctx context.Context, conditions *filter.Cont
}

// UpsertContact add or update contact. When adding a new contact, the system utilizes Paymail's PIKE capability to dispatch an invitation request, asking the counterparty to include the current user in their contacts.
func (wc *WalletClient) UpsertContact(ctx context.Context, paymail, fullName string, metadata map[string]any) (*models.Contact, ResponseError) {
return wc.UpsertContactForPaymail(ctx, paymail, fullName, metadata, "")
func (wc *WalletClient) UpsertContact(ctx context.Context, paymail, fullName, requesterPaymail string, metadata map[string]any) (*models.Contact, ResponseError) {
return wc.UpsertContactForPaymail(ctx, paymail, fullName, metadata, requesterPaymail)
}

// UpsertContactForPaymail add or update contact. When adding a new contact, the system utilizes Paymail's PIKE capability to dispatch an invitation request, asking the counterparty to include the current user in their contacts.
Expand Down

0 comments on commit 30b3202

Please sign in to comment.