Skip to content

Commit 9f77871

Browse files
VRamakrishnasandeepnRES
authored andcommitted
fix(weaver-satp): bug and configuration fixes in relays and Fabric drivers for sample SATP implementation
Modified the SATP trigger protobuf message. Fixed and augmented the satpsimpleasset chaincode to support SATP operation. Fixed and augmented the Fabric interop SDK to support SATP operation. Deleted obsolete files in the testnet folders and fixed minor typos in docs. Reissued expired sample certificates and keys and bug fixes. Sample certificates and keys used in dockerized relays, drivers, and iin-agents reissued with 5-year validity. Fixed a configuration bug in the IIN Agent configs whereby a string value was writted mistakenly as a boolean. Removed unnecessary deprecated 'start()' call for gRPC servers in Node services (Fabric driver, IIN-agent, SDK unit test). Signed-off-by: VRamakrishna <[email protected]>
1 parent f932da8 commit 9f77871

File tree

311 files changed

+2092
-14051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+2092
-14051
lines changed

docs/docs/weaver/getting-started/test-network/setup-local.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ Run a Corda driver as follows:
804804
```
805805
- Run the following to start Corda driver for `Corda_Network2`:
806806
```bash
807-
DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver
807+
DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda
808808
```
809809
If the driver starts successfully, it should log the following message on your terminal:
810810
```

docs/docs/weaver/getting-started/test-network/setup-packages.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -694,15 +694,15 @@ Run a Corda driver as follows:
694694
- Navigate to the `weaver/core/drivers/corda-driver` folder.
695695
- Run the following to start Corda driver for `Corda_Network`:
696696
```bash
697-
./build/install/corda-driver/bin/corda-driver
697+
./build/install/driver-corda/bin/driver-corda
698698
```
699699
If the driver starts successfully, it should log the following message on your terminal:
700700
```
701701
Corda driver gRPC server started. Listening on port 9099
702702
```
703703
- Run the following to start Corda driver for `Corda_Network2`:
704704
```bash
705-
DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver
705+
DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda
706706
```
707707
If the driver starts successfully, it should log the following message on your terminal:
708708
```

weaver/common/protos-go/networks/networks.pb.go

+111-99
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

weaver/common/protos-rs/pkg/src/generated/networks.networks.rs

+13-11
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,26 @@ pub struct NetworkEventUnsubscription {
7575
#[allow(clippy::derive_partial_eq_without_eq)]
7676
#[derive(Clone, PartialEq, ::prost::Message)]
7777
pub struct NetworkAssetTransfer {
78-
#[prost(string, repeated, tag = "1")]
79-
pub policy: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
78+
#[prost(string, tag = "1")]
79+
pub asset_type: ::prost::alloc::string::String,
8080
#[prost(string, tag = "2")]
81-
pub address: ::prost::alloc::string::String,
81+
pub asset_id: ::prost::alloc::string::String,
8282
#[prost(string, tag = "3")]
83-
pub requesting_relay: ::prost::alloc::string::String,
83+
pub sender: ::prost::alloc::string::String,
8484
#[prost(string, tag = "4")]
85-
pub requesting_network: ::prost::alloc::string::String,
85+
pub source_contract_id: ::prost::alloc::string::String,
8686
#[prost(string, tag = "5")]
87-
pub certificate: ::prost::alloc::string::String,
87+
pub source_relay: ::prost::alloc::string::String,
8888
#[prost(string, tag = "6")]
89-
pub requestor_signature: ::prost::alloc::string::String,
89+
pub source_network: ::prost::alloc::string::String,
9090
#[prost(string, tag = "7")]
91-
pub nonce: ::prost::alloc::string::String,
91+
pub destination_relay: ::prost::alloc::string::String,
9292
#[prost(string, tag = "8")]
93-
pub requesting_org: ::prost::alloc::string::String,
94-
#[prost(bool, tag = "9")]
95-
pub confidential: bool,
93+
pub destination_network: ::prost::alloc::string::String,
94+
#[prost(string, tag = "9")]
95+
pub recipient: ::prost::alloc::string::String,
96+
#[prost(string, tag = "10")]
97+
pub destination_contract_id: ::prost::alloc::string::String,
9698
}
9799
/// Generated client implementations.
98100
pub mod network_client {

weaver/common/protos/networks/networks.proto

+11-10
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@ message NetworkEventUnsubscription {
7777
}
7878

7979
message NetworkAssetTransfer {
80-
repeated string policy = 1;
81-
string address = 2;
82-
string requesting_relay = 3;
83-
string requesting_network = 4;
84-
string certificate = 5;
85-
string requestor_signature = 6;
86-
string nonce = 7;
87-
string requesting_org = 8;
88-
bool confidential = 9;
89-
}
80+
string asset_type = 1;
81+
string asset_id = 2;
82+
string sender = 3;
83+
string source_contract_id = 4;
84+
string source_relay = 5;
85+
string source_network = 6;
86+
string destination_relay = 7;
87+
string destination_network = 8;
88+
string recipient = 9;
89+
string destination_contract_id = 10;
90+
}

weaver/core/drivers/fabric-driver/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ cacti-weaver-sdk-fabric
1111
wallet-network1/*.id
1212
!wallet-network1/relay.id
1313
wallet-network2/*.id
14-
!wallet-network2/relay.id
14+
!wallet-network2/relay.id
15+
satp_info.txt

0 commit comments

Comments
 (0)