Merge branch 'main' into feat/no-error-return

Signed-off-by: jkawan <kawanjenita@outlook.com>

Author: jkawan

.github/workflows/conventional-commits.yml

@@ -13,5 +13,5 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 https://github.com/actions/checkout/releases/tag/v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 https://github.com/actions/checkout/releases/tag/v5.0.0
       - uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0 https://github.com/webiny/action-conventional-commits/releases/tag/v1.3.0

.github/workflows/go-test.yml

@@ -21,10 +21,10 @@ jobs:
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 https://github.com/actions/checkout/releases/tag/v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 https://github.com/actions/checkout/releases/tag/v5.0.0
         with:
           submodules: true
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 https://github.com/actions/setup-go/releases/tag/v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 https://github.com/actions/setup-go/releases/tag/v6.0.0
         with:
           go-version: ${{ matrix.go-version }}
       - name: go-test

.github/workflows/golangci-lint.yml

@@ -15,9 +15,9 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 https://github.com/actions/checkout/releases/tag/v4.2.2
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 https://github.com/actions/setup-go/releases/tag/v5.5.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 https://github.com/actions/checkout/releases/tag/v5.0.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 https://github.com/actions/setup-go/releases/tag/v6.0.0
         with:
           go-version: 1.24.x
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0 https://github.com/golangci/golangci-lint-action/releases/tag/v8.0.0
+        uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v9.0.0 https://github.com/golangci/golangci-lint-action/releases/tag/v9.0.0

.github/workflows/nilaway.yml

@@ -0,0 +1,25 @@
+name: nilaway
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  nilaway:
+    name: nilaway
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 https://github.com/actions/checkout/releases/tag/v5.0.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 https://github.com/actions/setup-go/releases/tag/v6.0.0
+        with:
+          go-version: 1.25.x
+      - name: install nilaway
+        run: go install go.uber.org/nilaway/cmd/nilaway@latest
+      - name: run nilaway
+        run: nilaway ./...

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
       RELEASE_ID: ${{ steps.create-release.outputs.result }}
     steps:
       - run: "echo \"RELEASE_TAG=${GITHUB_REF#refs/tags/}\" >> $GITHUB_ENV"
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 https://github.com/actions/github-script/releases/tag/v7.0.1
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 https://github.com/actions/github-script/releases/tag/v8.0.0
         id: create-release
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.golangci.yml

@@ -4,6 +4,7 @@ run:
   tests: false
 linters:
   enable:
+    - asasalint
     - asciicheck
     - bidichk
     - bodyclose
@@ -36,7 +37,6 @@ linters:
     - whitespace
     - zerologlint
   disable:
-    - asasalint
     - depguard
     - noctx
     - recvcheck

cbor/decode_test.go

@@ -271,3 +271,52 @@ func TestDecodeById(t *testing.T) {
 		}
 	}
 }
+
+func TestDecodeMaryTransactionCbor(t *testing.T) {
+	// Mary transaction CBOR hex from real chain data
+	maryTxHex := "83a50081825820377732953cbd7eb824e58291dd08599cfcfe6eedb49f590633610674fc3c33c50001818258390187acac5a3d0b41cd1c5e8c03af5be782f261f21beed70970ddee0873ae34f9d442c7f1a01de9f2dd520791122d6fbf3968c5f8328e9091331a597dbcf1021a0002fd99031a025c094a04828a03581c27b1b4470c84db78ce1ffbfff77bb068abb4e47d43cb6009caaa352358204a7537ce9eeaba1c650261f167827b4e12dd403c4bf13c56b2cba06288f7e9ab1a59682f001a1443fd00d81e82011864581de1ae34f9d442c7f1a01de9f2dd520791122d6fbf3968c5f8328e90913381581cae34f9d442c7f1a01de9f2dd520791122d6fbf3968c5f8328e9091338183011917706e33342e3139382e3234312e323336827468747470733a2f2f6769742e696f2f4a7543786e5820fa77d30bb41e2998233245d269ff5763ecf4371388214943ecef277cae45492783028200581cae34f9d442c7f1a01de9f2dd520791122d6fbf3968c5f8328e909133581c27b1b4470c84db78ce1ffbfff77bb068abb4e47d43cb6009caaa3523a10083825820922a22d07c0ca148105760cb767ece603574ea465d6697c87da8207c8936ebea58405594a100197379c0de715de0b5304e0546e661dae2f36b12173cc150a42215356a5600bf0c02954f02ce3620cfb7f12c23a19328fd00dd1194b4f363675ef407825820727c1891d01cf29ccd1146528221827dcf00a093498509404af77a8b15d77c925840f52e0e1403167212b11fe5d87b7cfdb2f39e5384979ac3625917127ad46763d864a7fcb7147c7b85322ada7ba8fe91c0b5152c74ef4ff0c8132b125e681af50382582073c16f2b67ff85307c4c5935bad1389b9ead473419dbad20f5d5e6436982992b58400572eed773b9a199fd486ebe61b480f05803d107ea97ff649f28b8874d3117f890f80657cbb6eea0d833c21e4e8bc7f1a27cddb9e24fc1ed79b04ddbdcd11d0ff6"
+
+	cborData, err := hex.DecodeString(maryTxHex)
+	if err != nil {
+		t.Fatalf("failed to decode Mary transaction hex: %s", err)
+	}
+
+	var decoded any
+	bytesRead, err := cbor.Decode(cborData, &decoded)
+	if err != nil {
+		t.Fatalf("failed to decode Mary transaction CBOR: %s", err)
+	}
+
+	if bytesRead != len(cborData) {
+		t.Fatalf(
+			"did not read all bytes: read %d, expected %d",
+			bytesRead,
+			len(cborData),
+		)
+	}
+
+	// Verify it's an array (transactions are arrays)
+	decodedSlice, ok := decoded.([]any)
+	if !ok {
+		t.Fatal("decoded Mary transaction is not an array")
+	}
+
+	if len(decodedSlice) != 3 {
+		t.Fatalf(
+			"Mary transaction array length mismatch: got %d, expected 3",
+			len(decodedSlice),
+		)
+	}
+}
+
+func BenchmarkDecode(b *testing.B) {
+	cborData, _ := hex.DecodeString("83010203")
+	var dest any
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, err := cbor.Decode(cborData, &dest)
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}

cbor/encode.go

@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"errors"
 	"reflect"
+	"sort"
 	"sync"
 
 	_cbor "github.com/fxamacker/cbor/v2"
@@ -132,3 +133,54 @@ func (i IndefLengthByteString) MarshalCBOR() ([]byte, error) {
 	)
 	return ret, nil
 }
+
+type IndefLengthMap map[any]any
+
+func (i IndefLengthMap) MarshalCBOR() ([]byte, error) {
+	ret := []byte{
+		// Start indefinite-length map
+		0xbf,
+	}
+
+	// Collect keys and sort them by their CBOR encoding for deterministic output
+	type keyValue struct {
+		key     any
+		keyCbor []byte
+		value   any
+	}
+
+	kvPairs := make([]keyValue, 0, len(map[any]any(i)))
+	for key, value := range map[any]any(i) {
+		keyData, err := Encode(key)
+		if err != nil {
+			return nil, err
+		}
+		kvPairs = append(kvPairs, keyValue{
+			key:     key,
+			keyCbor: keyData,
+			value:   value,
+		})
+	}
+
+	// Sort by CBOR-encoded key for deterministic ordering
+	sort.Slice(kvPairs, func(a, b int) bool {
+		return bytes.Compare(kvPairs[a].keyCbor, kvPairs[b].keyCbor) < 0
+	})
+
+	// Encode in sorted order
+	for _, kv := range kvPairs {
+		ret = append(ret, kv.keyCbor...)
+		valueData, err := Encode(kv.value)
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, valueData...)
+	}
+
+	ret = append(
+		ret,
+		// End indefinite length map
+		byte(0xff),
+	)
+	return ret, nil
+}

cbor/encode_test.go

@@ -90,3 +90,14 @@ func TestEncodeIndefLengthByteString(t *testing.T) {
 		)
 	}
 }
+
+func BenchmarkEncode(b *testing.B) {
+	obj := []any{1, 2, 3}
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		_, err := cbor.Encode(obj)
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}

cbor/tags.go

@@ -15,6 +15,7 @@
 package cbor
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math/big"
@@ -150,6 +151,24 @@ func (r *Rat) MarshalCBOR() ([]byte, error) {
 	return Encode(&tmpData)
 }
 
+func (r *Rat) UnmarshalJSON(data []byte) error {
+	// Try as ratio
+	var tmpData struct {
+		Numerator   int64 `json:"numerator"`
+		Denominator int64 `json:"denominator"`
+	}
+	if err := json.Unmarshal(data, &tmpData); err == nil {
+		r.Rat = big.NewRat(tmpData.Numerator, tmpData.Denominator)
+		return nil
+	}
+	// Try as decimal value
+	r.Rat = new(big.Rat)
+	if _, ok := r.SetString(string(data)); !ok {
+		return fmt.Errorf("math/big: cannot unmarshal %q into a *big.Rat", data)
+	}
+	return nil
+}
+
 func (r *Rat) ToBigRat() *big.Rat {
 	return r.Rat
 }
@@ -162,8 +181,8 @@ type Map map[any]any
 
 // SetType is a generic type for wrapping other types in an optional CBOR set tag
 type SetType[T any] struct {
-	useTag bool
 	items  []T
+	useTag bool
 }
 
 func NewSetType[T any](items []T, useTag bool) SetType[T] {