diff --git a/docs/docs/weaver/getting-started/test-network/ledger-initialization.md b/docs/docs/weaver/getting-started/test-network/ledger-initialization.md index f6c6fd3b3e..b2bdc78d28 100644 --- a/docs/docs/weaver/getting-started/test-network/ledger-initialization.md +++ b/docs/docs/weaver/getting-started/test-network/ledger-initialization.md @@ -69,6 +69,7 @@ Prepare `fabric-cli` for configuration suitably as follows. ```bash ./bin/fabric-cli env set-file ./.env ``` + | Notes | |:------| | If the `CONFIG_PATH` environment variable is omitted from `.env`, then you must also run:
```./bin/fabric-cli config set-file ./config.json``` | @@ -166,6 +167,7 @@ Prepare `fabric-cli` for configuration suitably as follows. ```bash ./bin/fabric-cli env set-file ./.env ``` + | Notes | |:------| | If the `CONFIG_PATH` environment variable is omitted from `.env`, then you must also run:
```./bin/fabric-cli config set-file ./config.json``` | @@ -283,6 +285,7 @@ Prepare `fabric-cli` for configuration suitably as follows. ``` ./bin/fabric-cli env set-file ./.env ``` + | Notes | |:------| | If the `CONFIG_PATH` environment variable is omitted from `.env`, then you must also run:
```./bin/fabric-cli config set-file ./config.json``` | diff --git a/docs/docs/weaver/getting-started/test-network/setup-local-docker.md b/docs/docs/weaver/getting-started/test-network/setup-local-docker.md index 72e5e6b88f..c0475d4a8d 100644 --- a/docs/docs/weaver/getting-started/test-network/setup-local-docker.md +++ b/docs/docs/weaver/getting-started/test-network/setup-local-docker.md @@ -49,6 +49,7 @@ Before starting, make sure you have the following software installed on your hos go install google.golang.org/protobuf/cmd/protoc-gen-go go install google.golang.org/grpc/cmd/protoc-gen-go-grpc ``` + | Notes | |:------| | The latest version at present is `3.15.6`, but you should check the above link to find the most current version before running the above steps. | @@ -273,6 +274,7 @@ make build-image-local #### Deployment Use the following steps to run Fabric IIN Agents in Docker containers: + * The `.env.n1.org1` and `.env.n1.org1.tls` files in the `docker-testnet/envs` directory contain environment variables used by the iin-agent of `org1` of `network1` at startup and runtime. Edit either of these files (depending on whether you wish to start the relay with or without TLS) as follows: - Replace `` with the absolute path of the `weaver` folder within your Cacti repository clone. - Update the following value: @@ -439,7 +441,7 @@ Navigate to the `weaver/core/relay` folder. Refer [here](#building-relay-image) ``` * The `.env.corda` and `.env.corda.tls` files in the `docker/testnet-envs` directory contain environment variables used by the `Corda_Network` relay at startup and runtime. Edit either of these files (depending on whether you wish to start the relay with or without TLS), and update the following value: ``` - DOCKER_IMAGE_NAME=weaver-relay-server + DOCKER_IMAGE_NAME=cacti-weaver-relay-server ``` * Repeat the above step for `.env.corda2` or `.env.corda2.tls` in `docker/testnet-envs` directory, which contain environment variables for the `Corda_Network2` relay. * To deploy the relay server for `Corda_Network` without TLS, run: diff --git a/docs/docs/weaver/getting-started/test-network/setup-local.md b/docs/docs/weaver/getting-started/test-network/setup-local.md index 90cdd46b72..820c724313 100644 --- a/docs/docs/weaver/getting-started/test-network/setup-local.md +++ b/docs/docs/weaver/getting-started/test-network/setup-local.md @@ -51,6 +51,7 @@ Before starting, make sure you have the following software installed on your hos go install google.golang.org/protobuf/cmd/protoc-gen-go go install google.golang.org/grpc/cmd/protoc-gen-go-grpc ``` + | Notes | |:------| | The latest version at present is `3.15.6`, but you should check the above link to find the most current version before running the above steps. | diff --git a/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md b/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md index e7a8bb955f..ecc1dab777 100644 --- a/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md +++ b/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md @@ -172,6 +172,7 @@ IIN Agent is a client of a member of a DLT network or security domain with speci #### Deployment Use the following steps to run Fabric IIN Agents in Docker containers: + * The `.env.n1.org1` and `.env.n1.org1.tls` files in the `docker-testnet/envs` directory contain environment variables used by the iin-agent of `org1` of `network1` at startup and runtime. Edit either of these files (depending on whether you wish to start the relay with or without TLS) as follows: - Replace `` with the absolute path of the `weaver` folder within your Cacti repository clone. - If Fabric network was started with 1 org, and IIN Agents are to be started with TLS enabled, update the `DNS_CONFIG_PATH` variable as: diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go b/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go index 6ad8978f12..bae0ec6d87 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go @@ -183,7 +183,6 @@ func (s *SmartContract) CreateLocalMembership(ctx contractapi.TransactionContext if err != nil { return fmt.Errorf("Unmarshal error: %s", err) } - membership.SecurityDomain = membershipLocalSecurityDomain membershipLocalKey, err := ctx.GetStub().CreateCompositeKey(membershipObjectType, []string{membershipLocalSecurityDomain}) acp, getErr := ctx.GetStub().GetState(membershipLocalKey) @@ -221,7 +220,6 @@ func (s *SmartContract) UpdateLocalMembership(ctx contractapi.TransactionContext if err != nil { return fmt.Errorf("Unmarshal error: %s", err) } - membership.SecurityDomain = membershipLocalSecurityDomain membershipLocalKey, err := ctx.GetStub().CreateCompositeKey(membershipObjectType, []string{membershipLocalSecurityDomain}) _, getErr := s.GetMembershipBySecurityDomain(ctx, membershipLocalSecurityDomain) diff --git a/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts b/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts index 3a33ad4ea5..282a8e1aee 100644 --- a/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts +++ b/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts @@ -142,12 +142,12 @@ const loadLocalHelper = async ( registerUser: false }) try { - const response = await MembershipManager.createLocalMembership(gateway, members, channelName, contractName) + const response = await MembershipManager.createLocalMembership(gateway, members, networkName, channelName, contractName) logger.info('CreateLocalMembership Successful.') } catch (e) { logger.error(e) logger.info('CreateLocalMembership attempting Update') - const response = await MembershipManager.updateLocalMembership(gateway, members, channelName, contractName) + const response = await MembershipManager.updateLocalMembership(gateway, members, networkName, channelName, contractName) logger.info('UpdateLocalMembership response: success: ', response) } } diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts index b0bf218d98..ca38534c82 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts @@ -22,12 +22,13 @@ import { handlePromise, promisifyAll } from './helpers' async function createLocalMembership( gateway: Gateway, memberMspIds: Array, + securityDomain: string, channelName: string, weaverCCId: string ): Promise { const network = await gateway.getNetwork(channelName) const membership = getMSPConfigurations(network, memberMspIds) - membership.setSecuritydomain('') + membership.setSecuritydomain(securityDomain) const membership64 = Buffer.from(membership.serializeBinary()).toString('base64') const contract = network.getContract(weaverCCId) return await contract.submitTransaction("CreateLocalMembership", membership64); @@ -36,12 +37,13 @@ async function createLocalMembership( async function updateLocalMembership( gateway: Gateway, memberMspIds: Array, + securityDomain: string, channelName: string, weaverCCId: string ): Promise { const network = await gateway.getNetwork(channelName) const membership = getMSPConfigurations(network, memberMspIds) - membership.setSecuritydomain('') + membership.setSecuritydomain(securityDomain) const membership64 = Buffer.from(membership.serializeBinary()).toString('base64') const contract = network.getContract(weaverCCId) return await contract.submitTransaction("UpdateLocalMembership", membership64);