Merge 074c5dc237 into a2c40e6522

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

@@ -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

token-erc-1155/chaincode-go/chaincode/contract.go

@@ -9,6 +9,7 @@ package chaincode
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/hyperledger/fabric-protos-go/ledger/queryresult"
 	"sort"
 	"strconv"
 	"strings"
@@ -949,6 +950,8 @@ func removeBalance(ctx contractapi.TransactionContextInterface, sender string, i
 		}
 		defer balanceIterator.Close()
 
+		var deferredDeletions = []func() error{}
+
 		// Iterate over keys that store balances and add them to partialBalance until
 		// either the necessary amount is reached or the keys ended
 		for balanceIterator.HasNext() && partialBalance < neededAmount {
@@ -972,40 +975,47 @@ func removeBalance(ctx contractapi.TransactionContextInterface, sender string, i
 				selfRecipientKeyNeedsToBeRemoved = true
 				selfRecipientKey = queryResponse.Key
 			} else {
-				err = ctx.GetStub().DelState(queryResponse.Key)
+				deferredDeletions = append(deferredDeletions, deferredDelete(ctx, queryResponse))
-				if err != nil {
-					return fmt.Errorf("failed to delete the state of %v: %v", queryResponse.Key, err)
-				}
 			}
 		}
 
 		if partialBalance < neededAmount {
 			return fmt.Errorf("sender has insufficient funds for token %v, needed funds: %v, available fund: %v", tokenId, neededAmount, partialBalance)
-		} else if partialBalance > neededAmount {
-			// Send the remainder back to the sender
-			remainder, err := sub(partialBalance, neededAmount)
-			if err != nil {
-				return err
-			}
-
-			if selfRecipientKeyNeedsToBeRemoved {
-				// Set balance for the key that has the same address for sender and recipient
-				err = setBalance(ctx, sender, sender, tokenId, remainder)
-				if err != nil {
-					return err
-				}
-			} else {
-				err = addBalance(ctx, sender, sender, tokenId, remainder)
-				if err != nil {
-					return err
-				}
-			}
-
 		} else {
-			// Delete self recipient key
+			// enough token funds have been found to perform the update
-			err = ctx.GetStub().DelState(selfRecipientKey)
+			// now we can delete the token entries to supply updated token balances
-			if err != nil {
+			for _, deleteFn := range deferredDeletions {
-				return fmt.Errorf("failed to delete the state of %v: %v", selfRecipientKey, err)
+				err := deleteFn()
+				if err != nil {
+					return err
+				}
+			}
+			if partialBalance > neededAmount {
+				// Send the remainder back to the sender
+				remainder, err := sub(partialBalance, neededAmount)
+				if err != nil {
+					return err
+				}
+
+				if selfRecipientKeyNeedsToBeRemoved {
+					// Set balance for the key that has the same address for sender and recipient
+					err = setBalance(ctx, sender, sender, tokenId, remainder)
+					if err != nil {
+						return err
+					}
+				} else {
+					err = addBalance(ctx, sender, sender, tokenId, remainder)
+					if err != nil {
+						return err
+					}
+				}
+
+			} else {
+				// Delete self recipient key
+				err = ctx.GetStub().DelState(selfRecipientKey)
+				if err != nil {
+					return fmt.Errorf("failed to delete the state of %v: %v", selfRecipientKey, err)
+				}
 			}
 		}
 	}
@@ -1013,6 +1023,16 @@ func removeBalance(ctx contractapi.TransactionContextInterface, sender string, i
 	return nil
 }
 
+func deferredDelete(ctx contractapi.TransactionContextInterface, queryResponse *queryresult.KV) func() error {
+	return func() error {
+		err := ctx.GetStub().DelState(queryResponse.Key)
+		if err != nil {
+			return fmt.Errorf("failed to delete the state of %v: %v", queryResponse.Key, err)
+		}
+		return nil
+	}
+}
+
 func emitTransferSingle(ctx contractapi.TransactionContextInterface, transferSingleEvent TransferSingle) error {
 	transferSingleEventJSON, err := json.Marshal(transferSingleEvent)
 	if err != nil {