From d999452f889ecb42f9d19cf5589c7741de19fe2f Mon Sep 17 00:00:00 2001
From: Arnav Vinod Deshpande <arnav.iitr@gmail.com>
Date: Tue, 5 May 2026 16:17:26 +0530
Subject: [PATCH 1/2] weak ordering implementation in sort.slice (#1414)

Signed-off-by: rootp1 <arnav.iitr@gmail.com>
---
 .../chaincode-go/chaincode/contract.go        |  4 +--
 .../chaincode-go/chaincode/contract_test.go   | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 token-erc-1155/chaincode-go/chaincode/contract_test.go

diff --git a/token-erc-1155/chaincode-go/chaincode/contract.go b/token-erc-1155/chaincode-go/chaincode/contract.go
index acd1fa9c..95e3b15b 100644
--- a/token-erc-1155/chaincode-go/chaincode/contract.go
+++ b/token-erc-1155/chaincode-go/chaincode/contract.go
@@ -1113,9 +1113,9 @@ func sortedKeysToID(m map[ToID]uint64) []ToID {
 	// Sort the slice first according to ID if equal then sort by recipient ("To" field)
 	sort.Slice(keys, func(i, j int) bool {
 		if keys[i].ID != keys[j].ID {
-			return keys[i].To < keys[j].To
+			return keys[i].ID < keys[j].ID
 		}
-		return keys[i].ID < keys[j].ID
+		return keys[i].To < keys[j].To
 	})
 	return keys
 }
diff --git a/token-erc-1155/chaincode-go/chaincode/contract_test.go b/token-erc-1155/chaincode-go/chaincode/contract_test.go
new file mode 100644
index 00000000..277eb698
--- /dev/null
+++ b/token-erc-1155/chaincode-go/chaincode/contract_test.go
@@ -0,0 +1,32 @@
+package chaincode
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestSortedKeysToID(t *testing.T) {
+	testMap := map[ToID]uint64{
+		{To: "Alice", ID: 2}:   100,
+		{To: "Bob", ID: 1}:     200,
+		{To: "Charlie", ID: 2}: 300,
+		{To: "Alice", ID: 1}:   400,
+		{To: "Bob", ID: 2}:     500,
+		{To: "Charlie", ID: 1}: 600,
+	}
+
+	expectedResult := []ToID{
+		{To: "Alice", ID: 1},
+		{To: "Bob", ID: 1},
+		{To: "Charlie", ID: 1},
+		{To: "Alice", ID: 2},
+		{To: "Bob", ID: 2},
+		{To: "Charlie", ID: 2},
+	}
+
+	result := sortedKeysToID(testMap)
+
+	if !reflect.DeepEqual(result, expectedResult) {
+		t.Fatalf("sortedKeysToID failed.\nExpected: %v\nGot:      %v", expectedResult, result)
+	}
+}

From a2c40e652273cd795944ec183962eb1a0c91b909 Mon Sep 17 00:00:00 2001
From: James Taylor <jt-nti@users.noreply.github.com>
Date: Thu, 21 May 2026 11:30:24 +0100
Subject: [PATCH 2/2] test-network-k8s: ghcr.io for Hyperledger images (#1416)

Default to using ghcr.io for Hyperledger images in the k8s test network

Signed-off-by: James Taylor <jamest@uk.ibm.com>
---
 test-network-k8s/network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-network-k8s/network b/test-network-k8s/network
index 7d9ebc2b..6611d8c4 100755
--- a/test-network-k8s/network
+++ b/test-network-k8s/network
@@ -35,7 +35,7 @@ context CLUSTER_RUNTIME               kind                  # or k3s for Rancher
 context CONTAINER_CLI                 docker                # or nerdctl for containerd
 context CONTAINER_NAMESPACE           ""                    # or "--namespace k8s.io" for containerd / nerdctl
 
-context FABRIC_CONTAINER_REGISTRY     hyperledger
+context FABRIC_CONTAINER_REGISTRY     ghcr.io/hyperledger
 context FABRIC_PEER_IMAGE             ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION}
 context COUCHDB_VERSION               3.4.2
 context NETWORK_NAME                  test-network