Skip to content

Commit

Permalink
Merge branch 'main' into refactor/remove-generic-error
Browse files Browse the repository at this point in the history
  • Loading branch information
b00f authored Sep 23, 2024
2 parents 6a98a29 + 9306bef commit 908276b
Show file tree
Hide file tree
Showing 29 changed files with 347 additions and 247 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Checkout code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deadlock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Checkout code
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Build the binary
run: make build_gui

- name: Installing golangci-lint
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61

- name: Lint check
run: BUILD_TAG=gtk make check
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Build the binary
run: make build_gui
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Checkout code
uses: actions/checkout@v4

- name: Installing golangci-lint
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61

- name: Formatting and linting the project
run: make check
10 changes: 5 additions & 5 deletions .github/workflows/releaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_cli.sh
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_gui_linux.sh
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_gui_macos.sh
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Create release files
run: bash ./.github/releasers/releaser_gui_macos.sh
Expand Down Expand Up @@ -267,4 +267,4 @@ jobs:
with:
files: .github/releasers/pactus_downloader.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/semantic-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
version
wallet
grpc
proto
http
jsonrpc
nanomsg
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22.2'
go-version: '1.23.1'

- name: Unit tests
run: make unit_test
5 changes: 3 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ linters:
- errname
- errorlint
- exhaustive
- exportloopref
- copyloopvar
- forbidigo
- gci
- ginkgolinter
Expand Down Expand Up @@ -143,6 +143,7 @@ linters-settings:
excludes:
- G304
- G204
- G115

stylecheck:
# TODO: enable ST1000 (at least one file in a package should have a package comment)
Expand All @@ -159,7 +160,7 @@ linters-settings:
predeclared:
# Comma-separated list of predeclared identifiers to not report on.
# Default: ""
ignore: "len"
ignore: "len, min, max"
# Include method names and field names (i.e., qualified names) in checks.
# Default: false
q: true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.2-alpine3.19 as builder
FROM golang:1.23.1-alpine3.19 as builder

RUN apk add --no-cache git gmp-dev build-base g++ openssl-dev
ADD . /pactus
Expand Down
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ all: build test
### Tools needed for development
devtools:
@echo "Installing devtools"
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.20
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.20
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.22
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.22
go install google.golang.org/protobuf/cmd/[email protected]
go install google.golang.org/grpc/cmd/[email protected]
go install github.com/NathanBaulch/[email protected]
go install github.com/pactus-project/protoc-gen-doc/cmd/[email protected]
go install github.com/bufbuild/buf/cmd/buf@v1.34
go install github.com/bufbuild/buf/cmd/buf@v1.42
go install mvdan.cc/gofumpt@latest
go install github.com/rakyll/[email protected]
go install github.com/pacviewer/jrpc-gateway/[email protected]

########################################
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func PromptConfirm(label string) bool {
}
result, err := prompt.Run()
if err != nil {
if !errors.Is(promptui.ErrAbort, err) {
if !errors.Is(err, promptui.ErrAbort) {
PrintErrorMsgf("prompt error: %v", err)
} else {
PrintWarnMsgf("Aborted.")
Expand Down
8 changes: 4 additions & 4 deletions cmd/gtk/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func updateMessageDialog(dlg *gtk.MessageDialog) {

func showQuestionDialog(parent gtk.IWindow, msg string) bool {
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, msg)
gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, "%s", msg)
updateMessageDialog(dlg)
res := dlg.Run()
dlg.Destroy()
Expand All @@ -46,23 +46,23 @@ func showQuestionDialog(parent gtk.IWindow, msg string) bool {

func showInfoDialog(parent gtk.IWindow, msg string) {
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, msg)
gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, "%s", msg)
updateMessageDialog(dlg)
dlg.Run()
dlg.Destroy()
}

func showWarningDialog(parent gtk.IWindow, msg string) {
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, msg)
gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, "%s", msg)
updateMessageDialog(dlg)
dlg.Run()
dlg.Destroy()
}

func showErrorDialog(parent gtk.IWindow, msg string) {
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, msg)
gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, "%s", msg)
updateMessageDialog(dlg)
dlg.Run()
dlg.Destroy()
Expand Down
8 changes: 7 additions & 1 deletion crypto/address_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ func TestFromString(t *testing.T) {
[]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
crypto.AddressTypeTreasury,
},
{
"00",
bech32m.InvalidLengthError(2),
nil,
0,
},
{
"",
bech32m.InvalidLengthError(0),
Expand Down Expand Up @@ -159,7 +165,7 @@ func TestFromString(t *testing.T) {
}
}

func TestAddressEncoding(t *testing.T) {
func TestAddressDecoding(t *testing.T) {
tests := []struct {
size int
hex string
Expand Down
91 changes: 91 additions & 0 deletions crypto/ed25519/ed25519_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/pactus-project/pactus/crypto"
"github.com/pactus-project/pactus/crypto/ed25519"
"github.com/pactus-project/pactus/util/testsuite"
"github.com/stretchr/testify/assert"
)

Expand All @@ -25,3 +26,93 @@ func TestSigning(t *testing.T) {
assert.Equal(t, pub, prv.PublicKey())
assert.Equal(t, addr, pub.AccountAddress())
}

// TestEd25519S ensures that the implementation of the Ed25519 signature scheme
// conforms to the specifications outlined in RFC8032. We are using test vectors
// to verify that the signature generation and verification work as intended:
// https://www.rfc-editor.org/rfc/rfc8032.txt
func TestEd25519S(t *testing.T) {
ts := testsuite.NewTestSuite(t)

tests := []struct {
sk string
pk string
msg string
sig string
}{
{
"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
"d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a",
"", // MESSAGE (length 0 bytes)
"e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e06522490155" +
"5fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b",
},

{
"4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb",
"3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c",
"72", // MESSAGE (length 1 byte)
"92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da" +
"085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00",
},

{
"c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7",
"fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025",
"af82", // MESSAGE (length 2 bytes)
"6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac" +
"18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a",
},

{
"f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5",
"278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e",
"08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98" + // MESSAGE (length 1023 bytes)
"fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d8" +
"79de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d" +
"658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc" +
"1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4fe" +
"ba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e" +
"06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbef" +
"efd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7" +
"aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed1" +
"85ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2" +
"d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24" +
"554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f270" +
"88d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc" +
"2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b07" +
"07e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128ba" +
"b27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51a" +
"ddd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429e" +
"c96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb7" +
"51fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c" +
"42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8" +
"ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34df" +
"f7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08" +
"d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649" +
"de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e4" +
"88acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a3" +
"2ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e" +
"6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5f" +
"b93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b5" +
"0d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1" +
"369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380d" +
"b2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c" +
"0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0",

"0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350" +
"aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03",
},
}

for _, test := range tests {
privateKey, _ := ed25519.PrivateKeyFromBytes(ts.DecodingHex(test.sk))
expectedPublicKey, _ := ed25519.PublicKeyFromBytes(ts.DecodingHex(test.pk))
msg := ts.DecodingHex(test.msg)
expectedSig, _ := ed25519.SignatureFromString(test.sig)
sig := privateKey.Sign(msg)

assert.Equal(t, expectedSig, sig)
assert.Equal(t, expectedPublicKey, privateKey.PublicKey())
}
}
3 changes: 2 additions & 1 deletion crypto/hash/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"golang.org/x/crypto/blake2b"
"golang.org/x/crypto/ripemd160" //nolint:staticcheck // use to hash the public key to get the address
"golang.org/x/crypto/ripemd160" //nolint:all // used to hash the public key to generate the address.
)

const HashSize = 32
Expand All @@ -21,6 +21,7 @@ func Hash256(data []byte) []byte {
}

func Hash160(data []byte) []byte {
//nolint:all // used to hash the public key to generate the address.
h := ripemd160.New()
n, err := h.Write(data)
if err != nil {
Expand Down
Loading

0 comments on commit 908276b

Please sign in to comment.