From 81e2f9ee95f9a0d34090d32966a502018ccbe643 Mon Sep 17 00:00:00 2001 From: Sandeep Nishad Date: Wed, 8 Feb 2023 22:46:26 +0530 Subject: [PATCH] fix: rename master to main; whitelist to allowlist Signed-off-by: Sandeep Nishad --- common/protos-go/fabric/view_data.pb.go | 6 ++--- common/protos-js/package.json | 2 +- common/protos/fabric/view_data.proto | 6 ++--- core/relay/relay-docker.md | 2 +- .../getting-started/test-network/overview.md | 26 +++++++++---------- .../test-network/setup-local-docker.md | 4 +-- .../test-network/setup-local.md | 6 ++--- .../test-network/setup-packages-docker.md | 4 +-- .../test-network/setup-packages.md | 4 +-- docs/docusaurus.config.js | 2 +- rfcs/formats/views/fabric.md | 6 ++--- rfcs/models/security/confidentiality.md | 2 +- rfcs/protocols/template-protocol.md | 24 ++++++++--------- samples/besu/besu-cli/readme.md | 2 +- samples/corda/fungible-house-token/README.md | 2 +- .../package-local.json | 2 +- .../interoperation-node-sdk/package.json | 2 +- .../fabric/shared/network1/config/core.yaml | 6 ++--- .../fabric/shared/network2/config/core.yaml | 6 ++--- .../charts/config-maps/peer-config/core.yaml | 4 +-- .../templates/postgres-service.yaml | 2 +- .../templates/postgres-statefulset.yaml | 4 +-- .../test/fabric/k8s/postgres-service.yaml | 2 +- .../test/fabric/k8s/postgres-statefulset.yaml | 4 +-- .../test/fabric/peer-config/core.yaml | 4 +-- 25 files changed, 63 insertions(+), 71 deletions(-) diff --git a/common/protos-go/fabric/view_data.pb.go b/common/protos-go/fabric/view_data.pb.go index 9035cf3739..88d2cf9952 100644 --- a/common/protos-go/fabric/view_data.pb.go +++ b/common/protos-go/fabric/view_data.pb.go @@ -74,13 +74,13 @@ type FabricView_EndorsedProposalResponse struct { unknownFields protoimpl.UnknownFields // `ProposalResponsePayload` is the output produced by each peer and signed as a serialized blob - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L176 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal_response.pb.go#L176 // `ProposalResponsePayload` contains an `Extension` field which is of type `ChaincodeAction` - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal.pb.go#L280 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal.pb.go#L280 // We only need the `ProposalHash`, `ChaincodeId` and `Response` fields. Payload *peer.ProposalResponsePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` // Each `Endorsement` is an identity coupled with a signature - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L242 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal_response.pb.go#L242 Endorsement *peer.Endorsement `protobuf:"bytes,2,opt,name=endorsement,proto3" json:"endorsement,omitempty"` } diff --git a/common/protos-js/package.json b/common/protos-js/package.json index e757d990ec..5564f82a8f 100644 --- a/common/protos-js/package.json +++ b/common/protos-js/package.json @@ -46,7 +46,7 @@ "licenses": [ { "type": "Apache-2.0", - "url": "https://github.com/hyperledger/fabric/blob/master/LICENSE" + "url": "https://github.com/hyperledger-labs/weaver-dlt-interoperability/blob/main/LICENSE" } ], "bugs": { diff --git a/common/protos/fabric/view_data.proto b/common/protos/fabric/view_data.proto index 08cd51130c..e2db541079 100644 --- a/common/protos/fabric/view_data.proto +++ b/common/protos/fabric/view_data.proto @@ -10,13 +10,13 @@ import "peer/proposal_response.proto"; message FabricView { message EndorsedProposalResponse { // `ProposalResponsePayload` is the output produced by each peer and signed as a serialized blob - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L176 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal_response.pb.go#L176 // `ProposalResponsePayload` contains an `Extension` field which is of type `ChaincodeAction` - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal.pb.go#L280 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal.pb.go#L280 // We only need the `ProposalHash`, `ChaincodeId` and `Response` fields. protos.ProposalResponsePayload payload = 1; // Each `Endorsement` is an identity coupled with a signature - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L242 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal_response.pb.go#L242 protos.Endorsement endorsement = 2; } repeated EndorsedProposalResponse endorsed_proposal_responses = 1; diff --git a/core/relay/relay-docker.md b/core/relay/relay-docker.md index cdc96ada8e..c09c90563a 100644 --- a/core/relay/relay-docker.md +++ b/core/relay/relay-docker.md @@ -42,7 +42,7 @@ The last four labels together with the timestamp of the build can also be found { "version" : "1.0", "protos_version" : "0.5", - "branch" : "master", + "branch" : "main", "commit" : "456372c", "timestap" : "2020-07-23 14:32:01+1000" } diff --git a/docs/docs/external/getting-started/test-network/overview.md b/docs/docs/external/getting-started/test-network/overview.md index 24f3c74541..08e7bbff81 100644 --- a/docs/docs/external/getting-started/test-network/overview.md +++ b/docs/docs/external/getting-started/test-network/overview.md @@ -11,19 +11,19 @@ title: Component Overview Weaver offers a basic test network launching capability, both to demonstrate interoperation modes and to serve as a testbed for development and prototyping. Different modes (or scenarios) require different sets of components, but collectively you will need to run the following: -- [Fabric testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/fabric/dev) - A pair of basic Fabric networks for testing interop flows -- [Corda testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/corda) - A pair of basic Corda networks for testing interop flows -- [Besu testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/besu) - A pair of basic Besu networks for testing interop flows -- [Relay](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/relay) - The server module and protocol for cross-DLT interoperability. An instance of this is needed for every Fabric and Corda network -- [Fabric driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/drivers/fabric-driver) - Driver used by the Fabric networks relay to communicate with the Fabric testnet -- [Corda driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/drivers/corda-driver) - Driver used by the Corda networks relay to communicate with the Corda testnet -- [Fabric Interop chaincode](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/network/fabric-interop-cc) - The Fabric interoperability contracts handle the dual process of servicing requests for views from external networks, and verifying requested views for integrity -- [Corda interop app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/network/corda-interop-app) CorDapp used to handle interop duties between the relay and the application -- [Besu interop contract](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/network/besu/contracts/interop) Solidity smart contract(s) used to handle interop duties for a Besu network -- [Fabric client](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/fabric/fabric-cli) - Fabric client used to trigger interop flows initiated from the Fabric side and to manage Fabric state -- [Corda client app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/corda/corda-simple-application) - CorDapp and client used to trigger interop flows initiated from the Corda side and to manage Corda state -- [Besu sample application](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/besu/simpleasset) - A sample application for asset exchange across two besu networks using HTLC -- [Besu client app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/samples/besu/besu-cli) - Besu client used to interact with the contracts deployed on the Besu testnet +- [Fabric testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/fabric/dev) - A pair of basic Fabric networks for testing interop flows +- [Corda testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/corda) - A pair of basic Corda networks for testing interop flows +- [Besu testnet](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/besu) - A pair of basic Besu networks for testing interop flows +- [Relay](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/relay) - The server module and protocol for cross-DLT interoperability. An instance of this is needed for every Fabric and Corda network +- [Fabric driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/drivers/fabric-driver) - Driver used by the Fabric networks relay to communicate with the Fabric testnet +- [Corda driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/drivers/corda-driver) - Driver used by the Corda networks relay to communicate with the Corda testnet +- [Fabric Interop chaincode](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/network/fabric-interop-cc) - The Fabric interoperability contracts handle the dual process of servicing requests for views from external networks, and verifying requested views for integrity +- [Corda interop app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/network/corda-interop-app) CorDapp used to handle interop duties between the relay and the application +- [Besu interop contract](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/network/besu/contracts/interop) Solidity smart contract(s) used to handle interop duties for a Besu network +- [Fabric client](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/samples/fabric/fabric-cli) - Fabric client used to trigger interop flows initiated from the Fabric side and to manage Fabric state +- [Corda client app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/samples/corda/corda-simple-application) - CorDapp and client used to trigger interop flows initiated from the Corda side and to manage Corda state +- [Besu sample application](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/samples/besu/simpleasset) - A sample application for asset exchange across two besu networks using HTLC +- [Besu client app](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/samples/besu/besu-cli) - Besu client used to interact with the contracts deployed on the Besu testnet You can launch these components in one of several different ways: * **Setup with Locally Built Weaver Components**: diff --git a/docs/docs/external/getting-started/test-network/setup-local-docker.md b/docs/docs/external/getting-started/test-network/setup-local-docker.md index 46d3f98f9c..8fe9895367 100644 --- a/docs/docs/external/getting-started/test-network/setup-local-docker.md +++ b/docs/docs/external/getting-started/test-network/setup-local-docker.md @@ -143,7 +143,7 @@ Follow the instructions below to build and launch the networks: | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1-local`, and for `network2`, run `make start-interop-network2-local` | | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop-local` | -For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/fabric/dev). +For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/fabric/dev). **Troubleshooting Tips**: - If you see any errors during the launches, re-check the prerequisites (software installations and credentials). Ensure your network connection is working. As a safe bet, you can retry after cleanup: kill and remove all Docker containers and associated volumes. @@ -193,7 +193,7 @@ make build-server-local make convert-compose-method1 ``` -For more information, see the [relay-docker README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/relay/relay-docker.md). +For more information, see the [relay-docker README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/relay/relay-docker.md). ### Fabric Driver diff --git a/docs/docs/external/getting-started/test-network/setup-local.md b/docs/docs/external/getting-started/test-network/setup-local.md index 13d6e0f3a5..aa2d5cdba7 100644 --- a/docs/docs/external/getting-started/test-network/setup-local.md +++ b/docs/docs/external/getting-started/test-network/setup-local.md @@ -151,7 +151,7 @@ Follow the instructions below to build and launch the networks: | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1-local`, and for `network2`, run `make start-interop-network2-local` | | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop-local` | -For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/fabric/dev). +For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/fabric/dev). **Troubleshooting Tips**: - If you see any errors during the launches, re-check the prerequisites (software installations and credentials). Ensure your network connection is working. As a safe bet, you can retry after cleanup: kill and remove all Docker containers and associated volumes. @@ -291,7 +291,7 @@ Run a relay for `network2` as follows (_do this only if you have launched both F RELAY_CONFIG=config/Fabric_Relay2.toml cargo run --bin server ``` -For more information, see the [relay README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/relay). +For more information, see the [relay README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/relay). ### Fabric Driver @@ -817,7 +817,7 @@ Follow the instructions below to build and launch the networks: |:------| | If you do not wish to test Besu-Besu interoperation, you can choose to launch only one of the two networks. For `Network1`, run `make start-network1`, and for `Network2`, run `make start-network2` | -For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/besu). +For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/besu). ### Contracts diff --git a/docs/docs/external/getting-started/test-network/setup-packages-docker.md b/docs/docs/external/getting-started/test-network/setup-packages-docker.md index 3849b0690c..4a56d5aff9 100644 --- a/docs/docs/external/getting-started/test-network/setup-packages-docker.md +++ b/docs/docs/external/getting-started/test-network/setup-packages-docker.md @@ -92,7 +92,7 @@ Follow the instructions below to build and launch the networks: | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1`, and for `network2`, run `make start-interop-network2` | | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop` | -For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/fabric/dev). +For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/fabric/dev). **Troubleshooting Tips**: - If you see any errors during the launches, re-check the prerequisites (software installations and credentials). Ensure your network connection is working. As a safe bet, you can retry after cleanup: kill and remove all Docker containers and associated volumes. @@ -131,7 +131,7 @@ Navigate to the `core/relay` folder and run a relay as follows: make convert-compose-method1 ``` -For more information, see the [relay-docker README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/relay/relay-docker.md). +For more information, see the [relay-docker README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/relay/relay-docker.md). ### Fabric Driver diff --git a/docs/docs/external/getting-started/test-network/setup-packages.md b/docs/docs/external/getting-started/test-network/setup-packages.md index 2a20748a21..b76beb3efd 100644 --- a/docs/docs/external/getting-started/test-network/setup-packages.md +++ b/docs/docs/external/getting-started/test-network/setup-packages.md @@ -95,7 +95,7 @@ Follow the instructions below to build and launch the networks: | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1`, and for `network2`, run `make start-interop-network2` | | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop` | -For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/tests/network-setups/fabric/dev). +For more information, refer to the associated [README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/tests/network-setups/fabric/dev). **Troubleshooting Tips**: - If you see any errors during the launches, re-check the prerequisites (software installations and credentials). Ensure your network connection is working. As a safe bet, you can retry after cleanup: kill and remove all Docker containers and associated volumes. @@ -235,7 +235,7 @@ Run a relay for `network2` as follows (_do this only if you have launched both F RELAY_CONFIG=config/Fabric_Relay2.toml cargo run --bin server ``` -For more information, see the [relay README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/master/core/relay). +For more information, see the [relay README](https://github.com/hyperledger-labs/weaver-dlt-interoperability/tree/main/core/relay). ### Fabric Driver diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index e749e2ef8f..469c7446de 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -58,7 +58,7 @@ module.exports = { sidebarPath: require.resolve('./sidebars.js'), // Please change this to your repo. editUrl: - 'https://github.com/hyperledger-labs/weaver-dlt-interoperability/edit/master/', + 'https://github.com/hyperledger-labs/weaver-dlt-interoperability/edit/main/', }, theme: { customCss: require.resolve('./src/css/custom.css'), diff --git a/rfcs/formats/views/fabric.md b/rfcs/formats/views/fabric.md index 9acce40b17..07fca5d4c4 100644 --- a/rfcs/formats/views/fabric.md +++ b/rfcs/formats/views/fabric.md @@ -35,13 +35,13 @@ The view from a Fabric network ledger (i.e., channel) is specified below. It con message FabricView { message EndorsedProposalResponse { // `ProposalResponsePayload` is the output produced by each peer and signed as a serialized blob - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L176 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal_response.pb.go#L176 // `ProposalResponsePayload` contains an `Extension` field which is of type `ChaincodeAction` - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal.pb.go#L280 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal.pb.go#L280 // We only need the `ProposalHash`, `ChaincodeId` and `Response` fields. protos.ProposalResponsePayload payload = 1; // Each `Endorsement` is an identity coupled with a signature - // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L242 + // https://github.com/hyperledger/fabric-protos-go/blob/main/peer/proposal_response.pb.go#L242 protos.Endorsement endorsement = 2; } repeated EndorsedProposalResponse endorsed_proposal_responses = 1; diff --git a/rfcs/models/security/confidentiality.md b/rfcs/models/security/confidentiality.md index bc70cd6b35..6b97f99708 100644 --- a/rfcs/models/security/confidentiality.md +++ b/rfcs/models/security/confidentiality.md @@ -46,5 +46,5 @@ This protocol ensures confidentiality against potentially malicious relays and a There are different ways in which the above protocol can be realized, and these are listed and discussed in the [appendix](confidentiality-design-choices.md). We use [Protocol #5](./confidentiality-design-choices.md#protocol-5) in the above model, as it is the most secure and usable option, and this is implemented in Weaver as a reference. Additional notes: -- Initially, Weaver will support encryption and decryption using [ECIES](https://github.com/ethereum/go-ethereum/tree/master/crypto/ecies) but other asymmetric key algorithms may be supported in the future, including with Ed25519 keys. +- Initially, Weaver will support encryption and decryption using [ECIES](https://github.com/ethereum/go-ethereum/tree/main/crypto/ecies) but other asymmetric key algorithms may be supported in the future, including with Ed25519 keys. - We can consider an alternative solution whereby even the applicaton client does not possess the private key, which instead is maintained by the interoperation module in the destination network. But this requires a private key to be disseminated to, and maintained in secondary storage by, multiple nodes. This is both logistically challenging and insecure; hence, we recommend the procedure describes above. diff --git a/rfcs/protocols/template-protocol.md b/rfcs/protocols/template-protocol.md index d863bed614..30305a79e1 100644 --- a/rfcs/protocols/template-protocol.md +++ b/rfcs/protocols/template-protocol.md @@ -17,7 +17,7 @@ One paragraph explanation of the feature. -> If the RFC you are proposing is **NOT** a protocol, please use [this template](https://github.com/hyperledger/aries-rfcs/tree/master/0000-template.md) as a starting point. +> If the RFC you are proposing is **NOT** a protocol, please use [this template](https://github.com/hyperledger/aries-rfcs/tree/main/0000-template.md) as a starting point. > When completing this template and before submitting as a PR, please remove the template text in sections (other than **Implementations**). The implementations section should remain as is. @@ -42,9 +42,9 @@ Protocol names are conventionally lower_snake_case (especially in URIs), but are URI: https://didcomm.org/lets_do_lunch// -Message types and protocols are identified with special URIs that match certain conventions. See [Message Type and Protocol Identifier URIs](https://github.com/hyperledger/aries-rfcs/tree/master/concepts/0003-protocols/uris.md) for more details. +Message types and protocols are identified with special URIs that match certain conventions. See [Message Type and Protocol Identifier URIs](https://github.com/hyperledger/aries-rfcs/tree/main/concepts/0003-protocols/uris.md) for more details. -The version of a protocol is declared carefully. See [Semver Rules for Protocols](https://github.com/hyperledger/aries-rfcs/tree/master/concepts/0003-protocols/semver.md) for details. +The version of a protocol is declared carefully. See [Semver Rules for Protocols](https://github.com/hyperledger/aries-rfcs/tree/main/concepts/0003-protocols/semver.md) for details. ## Key Concepts @@ -59,7 +59,7 @@ variants. ## Roles -> See [this note](https://github.com/hyperledger/aries-rfcs/tree/master/concepts/0003-protocols/roles-participants-etc.md) for definitions of the terms +> See [this note](https://github.com/hyperledger/aries-rfcs/tree/main/concepts/0003-protocols/roles-participants-etc.md) for definitions of the terms "role", "participant", and "party". Provides a formal name to each role in the protocol, says who and how many can @@ -70,7 +70,7 @@ credential must be known to the issuer"). The formal names for each role are important because they are used when [agents discover one another's -capabilities](https://github.com/hyperledger/aries-rfcs/tree/master/features/0031-discover-features); +capabilities](https://github.com/hyperledger/aries-rfcs/tree/main/features/0031-discover-features); an agent doesn't just claim that it supports a protocol; it makes a claim about which *roles* in the protocol it supports. An agent that supports credential issuance and an agent that supports credential holding may have very different @@ -86,7 +86,7 @@ errors, and what should happen to state as a result. A formal representation of this information is provided in a _state machine matrix_. It lists events as columns, and states as rows; a cell answers the question, "If I am in state X (=row), and event Y (=column) occurs, what happens to my state?" The [Tic Tac -Toe example](https://github.com/hyperledger/aries-rfcs/blob/master/concepts/0003-protocols/tictactoe/README.md#states) is typical. +Toe example](https://github.com/hyperledger/aries-rfcs/blob/main/concepts/0003-protocols/tictactoe/README.md#states) is typical. [Choreography Diagrams]( https://www.visual-paradigm.com/guide/bpmn/bpmn-orchestration-vs-choreography-vs-collaboration/#bpmn-choreography) @@ -102,8 +102,8 @@ the matrix form is used in many early RFCs. We leave it up to the community to settle on whether it wants to strongly recommend specific diagram types. -The formal names for each state are important, as they are used in [`ack`s](https://github.com/hyperledger/aries-rfcs/tree/master/features/0015-acks) -and [`problem-report`s](https://github.com/hyperledger/aries-rfcs/tree/master/features/0035-report-problem)). +The formal names for each state are important, as they are used in [`ack`s](https://github.com/hyperledger/aries-rfcs/tree/main/features/0015-acks) +and [`problem-report`s](https://github.com/hyperledger/aries-rfcs/tree/main/features/0035-report-problem)). For example, a `problem-report` message declares which state the sender arrived at because of the problem. This helps other participants to react to errors with confidence. Formal state names are also used in the @@ -113,15 +113,15 @@ By convention, state names use lower-kebab-case but are compared case-insensitively and ignoring punctuation. State management in protocols is a deep topic. For more information, please -see [State Details and State Machines](https://github.com/hyperledger/aries-rfcs/blob/master/concepts/0003-protocols/state-details.md). +see [State Details and State Machines](https://github.com/hyperledger/aries-rfcs/blob/main/concepts/0003-protocols/state-details.md). ## Messages If there is a message family associated with this protocol, this section describes each member of it. It should also note the names and versions of messages from other message families that are used by the -protocol (e.g., an [`ack`](https://github.com/hyperledger/aries-rfcs/tree/master/features/0015-acks) -or a [`problem-report`](https://github.com/hyperledger/aries-rfcs/tree/master/features/0035-report-problem)). +protocol (e.g., an [`ack`](https://github.com/hyperledger/aries-rfcs/tree/main/features/0015-acks) +or a [`problem-report`](https://github.com/hyperledger/aries-rfcs/tree/main/features/0035-report-problem)). Typically this section is written as a narrative, showing each message type in the context of an end-to-end sample interaction. All possible fields may not appear; an exhaustive catalog is saved for the "Reference" @@ -129,7 +129,7 @@ section. Sample messages that are presented in the narrative should also be checked in next to the markdown of the RFC, in [DIDComm Plaintext format]( -https://github.com/hyperledger/aries-rfcs/tree/master/features/0044-didcomm-file-and-mime-types#didcomm-messages-dm). +https://github.com/hyperledger/aries-rfcs/tree/main/features/0044-didcomm-file-and-mime-types#didcomm-messages-dm). ### Adopted Messages diff --git a/samples/besu/besu-cli/readme.md b/samples/besu/besu-cli/readme.md index d7155e7bc9..8e2b60adea 100644 --- a/samples/besu/besu-cli/readme.md +++ b/samples/besu/besu-cli/readme.md @@ -12,7 +12,7 @@ Here are the steps to exercise asset exchange using the besu-cli tool. ## Customizing your CLI -Check out the documentation at https://github.com/infinitered/gluegun/tree/master/docs. +Check out the documentation at https://github.com/infinitered/gluegun. ## Publishing to NPM diff --git a/samples/corda/fungible-house-token/README.md b/samples/corda/fungible-house-token/README.md index a3552d7e86..d6fce8ff0b 100644 --- a/samples/corda/fungible-house-token/README.md +++ b/samples/corda/fungible-house-token/README.md @@ -1,6 +1,6 @@ # Fungible House Token -The source is obtained from corda samples-kotlin repo: [FungibleHouseTokens](https://github.com/corda/samples-kotlin/tree/master/Tokens/fungiblehousetoken). +The source is obtained from corda samples-kotlin repo: [Samples-Kotlin](https://github.com/corda/samples-kotlin), in directory `Tokens/fungiblehousetoken`. Added few Workflows as an extension to that to support Asset exchange using HTLC from Weaver: diff --git a/sdks/fabric/interoperation-node-sdk/package-local.json b/sdks/fabric/interoperation-node-sdk/package-local.json index c458135028..4ebdeff762 100644 --- a/sdks/fabric/interoperation-node-sdk/package-local.json +++ b/sdks/fabric/interoperation-node-sdk/package-local.json @@ -68,7 +68,7 @@ "licenses": [ { "type": "Apache-2.0", - "url": "https://github.com/hyperledger/fabric/blob/master/LICENSE" + "url": "https://github.com/hyperledger-labs/weaver-dlt-interoperability/blob/main/LICENSE" } ], "nyc": { diff --git a/sdks/fabric/interoperation-node-sdk/package.json b/sdks/fabric/interoperation-node-sdk/package.json index 0525ab359b..2fa99b90af 100644 --- a/sdks/fabric/interoperation-node-sdk/package.json +++ b/sdks/fabric/interoperation-node-sdk/package.json @@ -68,7 +68,7 @@ "licenses": [ { "type": "Apache-2.0", - "url": "https://github.com/hyperledger/fabric/blob/master/LICENSE" + "url": "https://github.com/hyperledger-labs/weaver-dlt-interoperability/blob/main/LICENSE" } ], "nyc": { diff --git a/tests/network-setups/fabric/shared/network1/config/core.yaml b/tests/network-setups/fabric/shared/network1/config/core.yaml index 6ef6641e1b..a630798e45 100644 --- a/tests/network-setups/fabric/shared/network1/config/core.yaml +++ b/tests/network-setups/fabric/shared/network1/config/core.yaml @@ -541,7 +541,7 @@ chaincode: externalBuilders: [] # - path: /path/to/directory # name: descriptive-builder-name - # environmentWhitelist: + # propagateEnvironment: # - ENVVAR_NAME_TO_PROPAGATE_FROM_PEER # - GOPROXY @@ -575,9 +575,7 @@ chaincode: # A value <= 0 turns keepalive off keepalive: 0 - # system chaincodes whitelist. To add system chaincode "myscc" to the - # whitelist, add "myscc: enable" to the list below, and register in - # chaincode/importsysccs.go + # enabled system chaincodes. system: _lifecycle: enable cscc: enable diff --git a/tests/network-setups/fabric/shared/network2/config/core.yaml b/tests/network-setups/fabric/shared/network2/config/core.yaml index 487fa59e8d..d55e00fc7e 100644 --- a/tests/network-setups/fabric/shared/network2/config/core.yaml +++ b/tests/network-setups/fabric/shared/network2/config/core.yaml @@ -541,7 +541,7 @@ chaincode: externalBuilders: [] # - path: /path/to/directory # name: descriptive-builder-name - # environmentWhitelist: + # propagateEnvironment: # - ENVVAR_NAME_TO_PROPAGATE_FROM_PEER # - GOPROXY @@ -575,9 +575,7 @@ chaincode: # A value <= 0 turns keepalive off keepalive: 0 - # system chaincodes whitelist. To add system chaincode "myscc" to the - # whitelist, add "myscc: enable" to the list below, and register in - # chaincode/importsysccs.go + # enabled system chaincodes. system: _lifecycle: enable cscc: enable diff --git a/tests/network-setups/shared/charts/config-maps/peer-config/core.yaml b/tests/network-setups/shared/charts/config-maps/peer-config/core.yaml index 36949fb329..fd6cc5a55b 100644 --- a/tests/network-setups/shared/charts/config-maps/peer-config/core.yaml +++ b/tests/network-setups/shared/charts/config-maps/peer-config/core.yaml @@ -577,9 +577,7 @@ chaincode: # A value <= 0 turns keepalive off keepalive: 0 - # system chaincodes whitelist. To add system chaincode "myscc" to the - # whitelist, add "myscc: enable" to the list below, and register in - # chaincode/importsysccs.go + # enabled system chaincodes. system: _lifecycle: enable cscc: enable diff --git a/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-service.yaml b/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-service.yaml index d1ced712c5..ccaf1763eb 100644 --- a/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-service.yaml +++ b/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-service.yaml @@ -23,7 +23,7 @@ spec: targetPort: tcp-postgresql selector: app: {{ $name }} - role: master + role: main --- apiVersion: v1 kind: Service diff --git a/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-statefulset.yaml b/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-statefulset.yaml index c120fd8911..64d0cf1f23 100644 --- a/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-statefulset.yaml +++ b/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-statefulset.yaml @@ -23,13 +23,13 @@ spec: selector: matchLabels: app: {{ $name }} - role: master + role: main template: metadata: name: {{ $name }} labels: app: {{ $name }} - role: master + role: main spec: {{- if $.Values.global.postgresdb.securityContext.enabled }} securityContext: diff --git a/tests/network-setups/test/fabric/k8s/postgres-service.yaml b/tests/network-setups/test/fabric/k8s/postgres-service.yaml index 49c4b842a6..e0de4296e1 100644 --- a/tests/network-setups/test/fabric/k8s/postgres-service.yaml +++ b/tests/network-setups/test/fabric/k8s/postgres-service.yaml @@ -20,7 +20,7 @@ spec: targetPort: tcp-postgresql selector: app: postgresql-network1 - role: master + role: main --- apiVersion: v1 kind: Service diff --git a/tests/network-setups/test/fabric/k8s/postgres-statefulset.yaml b/tests/network-setups/test/fabric/k8s/postgres-statefulset.yaml index 03aaa6fe98..0ae89e101f 100644 --- a/tests/network-setups/test/fabric/k8s/postgres-statefulset.yaml +++ b/tests/network-setups/test/fabric/k8s/postgres-statefulset.yaml @@ -20,13 +20,13 @@ spec: selector: matchLabels: app: postgresql-network1 - role: master + role: main template: metadata: name: postgresql-network1 labels: app: postgresql-network1 - role: master + role: main spec: containers: - name: postgresql-network1 diff --git a/tests/network-setups/test/fabric/peer-config/core.yaml b/tests/network-setups/test/fabric/peer-config/core.yaml index 36949fb329..fd6cc5a55b 100644 --- a/tests/network-setups/test/fabric/peer-config/core.yaml +++ b/tests/network-setups/test/fabric/peer-config/core.yaml @@ -577,9 +577,7 @@ chaincode: # A value <= 0 turns keepalive off keepalive: 0 - # system chaincodes whitelist. To add system chaincode "myscc" to the - # whitelist, add "myscc: enable" to the list below, and register in - # chaincode/importsysccs.go + # enabled system chaincodes. system: _lifecycle: enable cscc: enable