Skip to content

Commit

Permalink
fix: rename master to main; whitelist to allowlist
Browse files Browse the repository at this point in the history
Signed-off-by: Sandeep Nishad <sandeepn.official@gmail.com>
  • Loading branch information
sandeepnRES committed Feb 8, 2023
1 parent b6e9cb4 commit 81e2f9e
Show file tree
Hide file tree
Showing 25 changed files with 63 additions and 71 deletions.
6 changes: 3 additions & 3 deletions common/protos-go/fabric/view_data.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/protos-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions common/protos/fabric/view_data.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/relay/relay-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
26 changes: 13 additions & 13 deletions docs/docs/external/getting-started/test-network/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
6 changes: 3 additions & 3 deletions rfcs/formats/views/fabric.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion rfcs/models/security/confidentiality.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading

0 comments on commit 81e2f9e

Please sign in to comment.