chore: apply patch

Author: MicBun

core/contractsapi/attestation_decoding.go

@@ -546,13 +546,19 @@ func ParseBooleanResult(payload []byte) (result bool, actionID uint16, err error
 		return false, 0, fmt.Errorf("payload too short for data provider length")
 	}
 	dataProviderLen := readUint32BE(payload, offset)
+	if offset+4+int(dataProviderLen) > len(payload) {
+		return false, 0, fmt.Errorf("payload too short for data provider content")
+	}
 	offset += 4 + int(dataProviderLen)
 
 	// 5. Skip stream ID (length-prefixed)
 	if offset+4 > len(payload) {
 		return false, 0, fmt.Errorf("payload too short for stream ID length")
 	}
 	streamIDLen := readUint32BE(payload, offset)
+	if offset+4+int(streamIDLen) > len(payload) {
+		return false, 0, fmt.Errorf("payload too short for stream ID content")
+	}
 	offset += 4 + int(streamIDLen)
 
 	// 6. Read action ID (2 bytes)
@@ -572,6 +578,9 @@ func ParseBooleanResult(payload []byte) (result bool, actionID uint16, err error
 		return false, actionID, fmt.Errorf("payload too short for arguments length")
 	}
 	argsLen := readUint32BE(payload, offset)
+	if offset+4+int(argsLen) > len(payload) {
+		return false, actionID, fmt.Errorf("payload too short for arguments content")
+	}
 	offset += 4 + int(argsLen)
 
 	// 8. Read result (length-prefixed)

core/contractsapi/order_book_markets_test.go

@@ -93,8 +93,8 @@ func TestEncodeQueryComponents_InvalidAddress(t *testing.T) {
 		},
 		{
 			name:         "Missing 0x prefix",
-			dataProvider: "1111111111111111111111111111111111111111",
-			expectError:  "data_provider must be 42 characters",
+			dataProvider: "xx1111111111111111111111111111111111111111",
+			expectError:  "data_provider must be 0x-prefixed",
 		},
 	}
 

core/contractsapi/query_components.go

@@ -12,10 +12,22 @@ import (
 var QueryComponentsABI abi.Arguments
 
 func init() {
-	addressType, _ := abi.NewType("address", "", nil)
-	bytes32Type, _ := abi.NewType("bytes32", "", nil)
-	stringType, _ := abi.NewType("string", "", nil)
-	bytesType, _ := abi.NewType("bytes", "", nil)
+	addressType, err := abi.NewType("address", "", nil)
+	if err != nil {
+		panic(fmt.Sprintf("failed to create address ABI type: %v", err))
+	}
+	bytes32Type, err := abi.NewType("bytes32", "", nil)
+	if err != nil {
+		panic(fmt.Sprintf("failed to create bytes32 ABI type: %v", err))
+	}
+	stringType, err := abi.NewType("string", "", nil)
+	if err != nil {
+		panic(fmt.Sprintf("failed to create string ABI type: %v", err))
+	}
+	bytesType, err := abi.NewType("bytes", "", nil)
+	if err != nil {
+		panic(fmt.Sprintf("failed to create bytes ABI type: %v", err))
+	}
 
 	QueryComponentsABI = abi.Arguments{
 		{Type: addressType, Name: "data_provider"},
@@ -103,7 +115,8 @@ func DecodeQueryComponents(encoded []byte) (dataProvider, streamID, actionID str
 		return "", "", "", nil, fmt.Errorf("expected [32]byte for stream_id, got %T", unpacked[1])
 	}
 	// Find the actual length by looking for trailing zeros
-	sidLen := 32
+	// Default to 0 so all-zero bytes yields empty string
+	sidLen := 0
 	for i := 31; i >= 0; i-- {
 		if sidBytes[i] != 0 {
 			sidLen = i + 1

core/types/order_book_types_test.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
@@ -267,7 +268,7 @@ func TestCreateMarketInput_Validate_ValidMaxSpreadRange(t *testing.T) {
 	validSpreads := []int{1, 5, 10, 25, 50}
 
 	for _, spread := range validSpreads {
-		t.Run(string(rune(spread+'0')), func(t *testing.T) {
+		t.Run(fmt.Sprintf("%d", spread), func(t *testing.T) {
 			input := CreateMarketInput{
 				Bridge:          "hoodi_tt2",
 				QueryComponents: createValidQueryComponents(128),
@@ -322,7 +323,7 @@ func TestCreateMarketInput_Validate_ValidMinOrderSize(t *testing.T) {
 	validSizes := []int64{1, 10, 100, 1000, 1000000}
 
 	for _, size := range validSizes {
-		t.Run(string(rune(size)), func(t *testing.T) {
+		t.Run(fmt.Sprintf("%d", size), func(t *testing.T) {
 			input := CreateMarketInput{
 				Bridge:          "hoodi_tt2",
 				QueryComponents: createValidQueryComponents(128),

tests/integration/batch_operations_test.go

@@ -29,12 +29,14 @@ func TestBatchOperations(t *testing.T) {
 
 	deployerWallet, err := kwilcrypto.Secp256k1PrivateKeyFromHex(AnonWalletPK)
 	require.NoError(t, err, "failed to parse anon wallet private key")
-	tnClient, err := tnclient.NewClient(ctx, TestKwilProvider, tnclient.WithSigner(auth.GetUserSigner(deployerWallet)))
-	require.NoError(t, err, "failed to create client")
 
 	authorizeWalletToDeployStreams(t, ctx, fixture, deployerWallet)
 
 	t.Run("TestSequentialSmallBatches", func(t *testing.T) {
+		// Create fresh client for this subtest to ensure clean nonce management
+		tnClient, err := tnclient.NewClient(ctx, TestKwilProvider, tnclient.WithSigner(auth.GetUserSigner(deployerWallet)))
+		require.NoError(t, err, "failed to create client")
+
 		streamId := util.GenerateStreamId("test-sequential-small")
 		streamLocator := tnClient.OwnStreamLocator(streamId)
 
@@ -107,6 +109,10 @@ func TestBatchOperations(t *testing.T) {
 	})
 
 	t.Run("TestSequentialLargeBatches", func(t *testing.T) {
+		// Create fresh client for this subtest to ensure clean nonce management
+		tnClient, err := tnclient.NewClient(ctx, TestKwilProvider, tnclient.WithSigner(auth.GetUserSigner(deployerWallet)))
+		require.NoError(t, err, "failed to create client")
+
 		streamId := util.GenerateStreamId("test-sequential-large")
 		streamLocator := tnClient.OwnStreamLocator(streamId)
 
@@ -184,6 +190,10 @@ func TestBatchOperations(t *testing.T) {
 			t.Skip("Skipping flaky rapid single record inserts test in CI")
 		}
 
+		// Create fresh client for this subtest to ensure clean nonce management
+		tnClient, err := tnclient.NewClient(ctx, TestKwilProvider, tnclient.WithSigner(auth.GetUserSigner(deployerWallet)))
+		require.NoError(t, err, "failed to create client")
+
 		streamId := util.GenerateStreamId("test-rapid-singles")
 		streamLocator := tnClient.OwnStreamLocator(streamId)