Merge remote-tracking branch 'refs/remotes/upstream/main' into fix-egoistic-funding

# Conflicts:
#	apps/payment/app_internal_test.go
#	apps/payment/randomizer.go
#	apps/payment/randomizer_internal_test.go
#	apps/payment/resolver_internal_test.go
#	backend/sim/channel/app.go
#	backend/sim/channel/asset.go
#	backend/sim/channel/backend.go
#	backend/sim/channel/channel_internal_test.go
#	backend/sim/channel/init.go
#	backend/sim/wallet/account.go
#	backend/sim/wallet/address.go
#	backend/sim/wallet/init.go
#	backend/sim/wallet/wallet.go
#	channel/actionmachine.go
#	channel/adjudicator.go
#	channel/allocation.go
#	channel/allocation_test.go
#	channel/app.go
#	channel/backend.go
#	channel/backendtest.go
#	channel/errors.go
#	channel/machine.go
#	channel/machine_test.go
#	channel/mock_app.go
#	channel/mock_app_internal_test.go
#	channel/multi/adjudicator.go
#	channel/multi/asset.go
#	channel/multi/funder.go
#	channel/multi/subscription.go
#	channel/params.go
#	channel/params_test.go
#	channel/persistence/keyvalue/cache.go
#	channel/persistence/keyvalue/persistedstate.go
#	channel/persistence/keyvalue/persister.go
#	channel/persistence/keyvalue/persistrestorer_internal_test.go
#	channel/persistence/keyvalue/restorer.go
#	channel/persistence/nonpersister.go
#	channel/persistence/persistence.go
#	channel/persistence/statemachine_test.go
#	channel/persistence/test/channel.go
#	channel/persistence/test/peerchans.go
#	channel/persistence/test/peerchans_internal_test.go
#	channel/persistence/test/persistrestorer.go
#	channel/persistence/test/persistrestorertest.go
#	channel/state.go
#	channel/statemachine.go
#	channel/test/app_randomizer.go
#	channel/test/backend.go
#	channel/test/mock_app_randomizer.go
#	channel/test/randomizer.go
#	channel/test/randomopts.go
#	channel/transaction_test.go
#	client/adjudicate.go
#	client/appchannel_test.go
#	client/channel.go
#	client/channelconn.go
#	client/chanregistry.go
#	client/client.go
#	client/client_internal_test.go
#	client/client_persistence_test.go
#	client/client_role_test.go
#	client/client_test.go
#	client/clientconn.go
#	client/failing_funding_test.go
#	client/payment_test.go
#	client/proposal.go
#	client/proposal_internal_test.go
#	client/proposalmsgs.go
#	client/restore.go
#	client/restore_internal_test.go
#	client/serialize.go
#	client/subchannel.go
#	client/subchannel_test.go
#	client/sync.go
#	client/syncmsgs.go
#	client/test/backend.go
#	client/test/channel.go
#	client/test/fund.go
#	client/test/handler.go
#	client/test/multiledger.go
#	client/test/multiledger_dispute.go
#	client/test/multiledger_happy.go
#	client/test/persistence.go
#	client/test/proposalmsgs.go
#	client/test/randomproposal.go
#	client/test/role.go
#	client/test/subchannel.go
#	client/test/subchannel_dispute.go
#	client/test/updatemsgs.go
#	client/test/virtualchannel.go
#	client/update.go
#	client/updateinterception.go
#	client/updatemsgs.go
#	client/virtual_channel.go
#	client/virtual_channel_settlement.go
#	client/virtual_channel_test.go
#	log/logrus/logrus_internal_test.go
#	wallet/address.go
#	wallet/address_test.go
#	wallet/backend.go
#	wallet/sig.go
#	wallet/test/randomizer.go
#	wallet/test/wallet.go
#	wallet/test/walletbench.go
#	watcher/local/adjudicatorpubsub.go
#	watcher/local/registry.go
#	watcher/local/statespubsub.go
#	watcher/local/watcher.go
#	watcher/local/watcher_test.go
#	watcher/watcher.go
#	wire/account.go
#	wire/address.go
#	wire/bus.go
#	wire/encode.go
#	wire/hybridbus.go
#	wire/hybridbus_test.go
#	wire/localbus.go
#	wire/localbus_test.go
#	wire/net/bus.go
#	wire/net/bus_test.go
#	wire/net/dialer.go
#	wire/net/endpoint.go
#	wire/net/endpoint_internal_test.go
#	wire/net/endpoint_registry.go
#	wire/net/endpoint_registry_external_test.go
#	wire/net/endpoint_registry_internal_test.go
#	wire/net/exchange_addr.go
#	wire/net/exchange_addr_internal_test.go
#	wire/net/simple/address.go
#	wire/net/simple/dialer.go
#	wire/net/simple/dialer_internal_test.go
#	wire/net/simple/simple_exchange_addr_test.go
#	wire/net/test/connhub.go
#	wire/net/test/connhub_internal_test.go
#	wire/net/test/dialer.go
#	wire/net/test/listenermap.go
#	wire/perunio/serializer/serializer.go
#	wire/perunio/test/serializertest.go
#	wire/protobuf/proposalmsgs.go
#	wire/protobuf/serializer.go
#	wire/protobuf/updatemsgs.go
#	wire/protobuf/wire.pb.go
#	wire/protobuf/wire.proto
#	wire/test/bustest.go
#	wire/test/msgstest.go
#	wire/test/randomizer.go

Author: sophia1ch

.github/workflows/ci.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -82,7 +82,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build

CHANGELOG.md

@@ -49,3 +49,6 @@ PolyCrypt GmbH
 Robert Bosch GmbH
     Manoranjith <ponraj.manoranjitha@in.bosch.com>
     Anagha Sukumaran <sukumaran.anaghak@in.bosch.com>
+
+The Linux Foundation
+    Ry Jones <ry@linux.com>

NOTICE

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

apps/payment/app_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

apps/payment/randomizer.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

apps/payment/randomizer_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

apps/payment/resolver_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/channel/app.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/channel/asset.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/channel/backend.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/channel/channel_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/channel/init.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/wallet/account.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/wallet/address.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/wallet/init.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

backend/sim/wallet/wallet.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/actionmachine.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/adjudicator.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/allocation.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/allocation_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/app.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/backend.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/backendtest.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/errors.go

@@ -1,4 +1,4 @@
-// Copyright 2019 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/errors_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/machine.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/machine_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/mock_app.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/mock_app_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/multi/adjudicator.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/multi/asset.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -128,6 +128,5 @@ func fundLedgers(ctx context.Context, request channel.FundingReq, assetIDs []Led
 			return err
 		}
 	}
-
 	return nil
 }

channel/multi/funder.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/multi/subscription.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/params.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/params_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/keyvalue/cache.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/keyvalue/persistedstate.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/keyvalue/persister.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/keyvalue/persistrestorer_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/keyvalue/restorer.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/nonpersister.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/persistence.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/statemachine_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/test/channel.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/test/peerchans.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/test/peerchans_internal_test.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/test/persistrestorer.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/persistence/test/persistrestorertest.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/state.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/statemachine.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/test/app_randomizer.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/test/backend.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/test/mock_app_randomizer.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

channel/test/randomizer.go

@@ -1,4 +1,4 @@
-// Copyright 2024 - See NOTICE file for copyright holders.
+// Copyright 2025 - See NOTICE file for copyright holders.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.