Skip to content

Commit

Permalink
cgo: Add verify message.
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeGruffins committed Oct 17, 2024
1 parent dbc5f93 commit 16b2e91
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 90 deletions.
55 changes: 16 additions & 39 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,32 @@ name: Build and Test
on: [push, pull_request]
permissions:
contents: read

jobs:
build-go:
build:
name: Go CI
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.20', '1.21']
go: ["1.22", "1.23"]
steps:
- uses: awalsh128/cache-apt-pkgs-action@1850ee53f6e706525805321a3f2f863dcf73c962 #v1.3.0
with:
packages: git-restore-mtime libgtk-3-dev libwebkit2gtk-4.0-dev
version: 1.0

- name: Check out source
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: ${{ matrix.go }}

- name: Check out source
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
with:
fetch-depth: 0
# Restore original file modification times for test cache reasons
- name: restore timestamps
run: git restore-mtime
- name: Install Linters
run: "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2"
- name: Use test and module cache
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
- name: Use lint cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: go-test-${{ matrix.go }}-${{ github.sha }}
restore-keys: go-test-${{ matrix.go }}

~/.cache/golangci-lint
key: go-lint-${{ matrix.go }}-${{ hashFiles('./go.sum') }}
restore-keys: go-lint-${{ matrix.go }}
- name: Install Linters
run: "go install github.com/golangci/golangci-lint/cmd/[email protected]"
- name: Build
run: go build ./...
- name: Test
env:
GO111MODULE: "on"
run: |
./run_tests.sh
lint-docs:
name: Lint Markdown
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
- uses: DavidAnson/markdownlint-cli2-action@3aaa38e446fbd2c288af4291aa0f55d64651050f #v12.0.0
continue-on-error: true
with:
globs: |
*.md
sh ./run_tests.sh
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ run:
deadline: 10m

output:
format: github-actions,colored-line-number
formats: colored-line-number

linters:
disable-all: true
enable:
- asciicheck
- bidichk
- durationcheck
- exportloopref
- copyloopvar
- gofmt
- goimports
- gosimple
Expand Down
36 changes: 31 additions & 5 deletions cgo/addresses.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/base64"
"encoding/json"

dcrwallet "decred.org/dcrwallet/v4/wallet"
"decred.org/dcrwallet/v4/wallet/udb"
"github.com/decred/dcrd/txscript/v4/stdaddr"
)
Expand All @@ -27,7 +28,7 @@ func currentReceiveAddress(cName *C.char) *C.char {
return errCResponse("w.CurrentAddress error: %v", err)
}

return successCResponse(addr.String())
return successCResponse("%s", addr)
}

//export newExternalAddress
Expand Down Expand Up @@ -55,7 +56,7 @@ func newExternalAddress(cName *C.char) *C.char {
return errCResponse("w.CurrentAddress error: %v", err)
}

return successCResponse(addr.String())
return successCResponse("%s", addr)
}

//export signMessage
Expand All @@ -81,7 +82,32 @@ func signMessage(cName, cMessage, cAddress, cPassword *C.char) *C.char {

sEnc := base64.StdEncoding.EncodeToString(sig)

return successCResponse(sEnc)
return successCResponse("%s", sEnc)
}

//export verifyMessage
func verifyMessage(cName, cMessage, cAddress, cSig *C.char) *C.char {
w, ok := loadedWallet(cName)
if !ok {
return errCResponse("wallet with name %q is not loaded", goString(cName))
}

addr, err := stdaddr.DecodeAddress(goString(cAddress), w.MainWallet().ChainParams())
if err != nil {
return errCResponse("unable to decode address: %v", err)
}

sig, err := base64.StdEncoding.DecodeString(goString(cSig))
if err != nil {
return errCResponse("unable to decode signature: %v", err)
}

ok, err = dcrwallet.VerifyMessage(goString(cMessage), addr, sig, w.MainWallet().ChainParams())
if err != nil {
return errCResponse("unable to verify message: %v", err)
}

return successCResponse("%v", ok)
}

//export addresses
Expand Down Expand Up @@ -111,7 +137,7 @@ func addresses(cName *C.char) *C.char {
return errCResponse("unable to marshal addresses: %v", err)
}

return successCResponse(string(b))
return successCResponse("%s", b)
}

//export defaultPubkey
Expand All @@ -126,5 +152,5 @@ func defaultPubkey(cName *C.char) *C.char {
return errCResponse("unable to get default pubkey: %v", err)
}

return successCResponse(pubkey)
return successCResponse("%s", pubkey)
}
6 changes: 3 additions & 3 deletions cgo/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func syncWallet(cName, cPeers *C.char) *C.char {
},
}
if err := w.StartSync(w.ctx, ntfns, peers...); err != nil {
return errCResponse(err.Error())
return errCResponse("%v", err)
}
return successCResponse("sync started")
}
Expand Down Expand Up @@ -168,7 +168,7 @@ func syncWalletStatus(cName *C.char) *C.char {
if err != nil {
return errCResponse("unable to marshal sync status result: %v", err)
}
return successCResponse(string(b))
return successCResponse("%s", b)
}

//export rescanFromHeight
Expand Down Expand Up @@ -255,5 +255,5 @@ func birthState(cName *C.char) *C.char {
if err != nil {
return errCResponse("unable to marshal birth state result: %v", err)
}
return successCResponse(string(b))
return successCResponse("%s", b)
}
13 changes: 6 additions & 7 deletions cgo/transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import "C"
import (
"encoding/hex"
"encoding/json"
"fmt"
"math"
"strconv"

Expand Down Expand Up @@ -73,7 +72,7 @@ func createSignedTransaction(cName, cCreateSignedTxJSONReq *C.char) *C.char {
if err != nil {
return errCResponse("unable to marshal sign send transaction result: %v", err)
}
return successCResponse(string(b))
return successCResponse("%v", b)
}

//export sendRawTransaction
Expand All @@ -86,7 +85,7 @@ func sendRawTransaction(cName, cTxHex *C.char) *C.char {
if err != nil {
return errCResponse("unable to sign send transaction: %v", err)
}
return successCResponse(txHash.String())
return successCResponse("%s", txHash)
}

//export listUnspents
Expand Down Expand Up @@ -126,7 +125,7 @@ func listUnspents(cName *C.char) *C.char {
if err != nil {
return errCResponse("unable to marshal list unspents result: %v", err)
}
return successCResponse(string(b))
return successCResponse("%s", b)
}

//export estimateFee
Expand All @@ -143,7 +142,7 @@ func estimateFee(cName, cNBlocks *C.char) *C.char {
if err != nil {
return errCResponse("unable to get fee from oracle: %v", err)
}
return successCResponse(fmt.Sprintf("%d", (uint64(txFee * 1e8))))
return successCResponse("%d", uint64(txFee*1e8))
}

//export listTransactions
Expand Down Expand Up @@ -182,7 +181,7 @@ func listTransactions(cName, cFrom, cCount *C.char) *C.char {
if err != nil {
return errCResponse("unable to marshal list transactions result: %v", err)
}
return successCResponse(string(b))
return successCResponse("%s", b)
}

//export bestBlock
Expand All @@ -200,5 +199,5 @@ func bestBlock(cName *C.char) *C.char {
if err != nil {
return errCResponse("unable to marshal best block result: %v", err)
}
return successCResponse(string(b))
return successCResponse("%s", b)
}
21 changes: 10 additions & 11 deletions cgo/walletloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import "C"
import (
"context"
"encoding/json"
"fmt"
"sync"

"decred.org/dcrdex/client/mnemonic"
Expand Down Expand Up @@ -44,7 +43,7 @@ func createWallet(cName, cDataDir, cNet, cPass, cMnemonic *C.char) *C.char {

network, err := asset.NetFromString(goString(cNet))
if err != nil {
return errCResponse(err.Error())
return errCResponse("%v", err)
}

logger := logBackend.Logger("[" + name + "]")
Expand Down Expand Up @@ -76,7 +75,7 @@ func createWallet(cName, cDataDir, cNet, cPass, cMnemonic *C.char) *C.char {
w, err := dcr.CreateWallet(walletCtx, params, recoveryConfig)
if err != nil {
cancel()
return errCResponse(err.Error())
return errCResponse("%v", err)
}

wallets[name] = &wallet{
Expand All @@ -103,7 +102,7 @@ func createWatchOnlyWallet(cName, cDataDir, cNet, cPub *C.char) *C.char {

network, err := asset.NetFromString(goString(cNet))
if err != nil {
return errCResponse(err.Error())
return errCResponse("%v", err)
}

logger := logBackend.Logger("[" + name + "]")
Expand All @@ -122,7 +121,7 @@ func createWatchOnlyWallet(cName, cDataDir, cNet, cPub *C.char) *C.char {
w, err := dcr.CreateWatchOnlyWallet(walletCtx, goString(cPub), params)
if err != nil {
cancel()
return errCResponse(err.Error())
return errCResponse("%v", err)
}

wallets[name] = &wallet{
Expand All @@ -149,7 +148,7 @@ func loadWallet(cName, cDataDir, cNet *C.char) *C.char {

network, err := asset.NetFromString(goString(cNet))
if err != nil {
return errCResponse(err.Error())
return errCResponse("%v", err)
}

logger := logBackend.Logger("[" + name + "]")
Expand All @@ -166,12 +165,12 @@ func loadWallet(cName, cDataDir, cNet *C.char) *C.char {
w, err := dcr.LoadWallet(walletCtx, params)
if err != nil {
cancel()
return errCResponse(err.Error())
return errCResponse("%v", err)
}

if err = w.OpenWallet(walletCtx); err != nil {
cancel()
return errCResponse(err.Error())
return errCResponse("%v", err)
}

wallets[name] = &wallet{
Expand All @@ -180,7 +179,7 @@ func loadWallet(cName, cDataDir, cNet *C.char) *C.char {
ctx: walletCtx,
cancelCtx: cancel,
}
return successCResponse(fmt.Sprintf("wallet %q loaded", name))
return successCResponse("wallet %q loaded", name)
}

//export walletSeed
Expand All @@ -195,7 +194,7 @@ func walletSeed(cName, cPass *C.char) *C.char {
return errCResponse("w.DecryptSeed error: %v", err)
}

return successCResponse(seed)
return successCResponse("%s", seed)
}

//export walletBalance
Expand Down Expand Up @@ -226,7 +225,7 @@ func walletBalance(cName *C.char) *C.char {
return errCResponse("marshal balMap error: %v", err)
}

return successCResponse(string(balJson))
return successCResponse("%s", balJson)
}

//export closeWallet
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/decred/libwallet

require (
decred.org/dcrdex v0.0.0-20240415203145-79c4689fd164
decred.org/dcrwallet/v4 v4.1.2
decred.org/dcrwallet/v4 v4.1.3
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
github.com/decred/dcrd/addrmgr/v2 v2.0.4
github.com/decred/dcrd/chaincfg/chainhash v1.0.4
Expand All @@ -15,7 +15,7 @@ require (
github.com/decred/slog v1.2.0
github.com/jrick/logrotate v1.0.0
github.com/kevinburke/nacl v0.0.0-20210405173606-cd9060f5f776
golang.org/x/crypto v0.24.0
golang.org/x/crypto v0.26.0
)

require (
Expand All @@ -36,19 +36,19 @@ require (
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/decred/dcrd/dcrjson/v4 v4.1.0 // indirect
github.com/decred/dcrd/gcs/v4 v4.1.0 // indirect
github.com/decred/dcrd/mixing v0.4.0 // indirect
github.com/decred/dcrd/mixing v0.4.1 // indirect
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.3.0 // indirect
github.com/decred/go-socks v1.1.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/jrick/bitset v1.0.0 // indirect
github.com/jrick/wsrpc/v2 v2.3.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/stretchr/testify v1.8.2 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
lukechampine.com/blake3 v1.3.0 // indirect
)

go 1.19
go 1.22
Loading

0 comments on commit 16b2e91

Please sign in to comment.