Skip to content

Commit

Permalink
fix(weaver-satp): bug and configuration fixes in relays and Fabric dr…
Browse files Browse the repository at this point in the history
…ivers 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]>
  • Loading branch information
VRamakrishna authored and sandeepnRES committed May 22, 2024
1 parent f932da8 commit 9f77871
Show file tree
Hide file tree
Showing 311 changed files with 2,092 additions and 14,051 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ Run a Corda driver as follows:
```
- Run the following to start Corda driver for `Corda_Network2`:
```bash
DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver
DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda
```
If the driver starts successfully, it should log the following message on your terminal:
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -694,15 +694,15 @@ Run a Corda driver as follows:
- Navigate to the `weaver/core/drivers/corda-driver` folder.
- Run the following to start Corda driver for `Corda_Network`:
```bash
./build/install/corda-driver/bin/corda-driver
./build/install/driver-corda/bin/driver-corda
```
If the driver starts successfully, it should log the following message on your terminal:
```
Corda driver gRPC server started. Listening on port 9099
```
- Run the following to start Corda driver for `Corda_Network2`:
```bash
DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver
DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda
```
If the driver starts successfully, it should log the following message on your terminal:
```
Expand Down
210 changes: 111 additions & 99 deletions weaver/common/protos-go/networks/networks.pb.go

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions weaver/common/protos-rs/pkg/src/generated/networks.networks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,26 @@ pub struct NetworkEventUnsubscription {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct NetworkAssetTransfer {
#[prost(string, repeated, tag = "1")]
pub policy: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
#[prost(string, tag = "1")]
pub asset_type: ::prost::alloc::string::String,
#[prost(string, tag = "2")]
pub address: ::prost::alloc::string::String,
pub asset_id: ::prost::alloc::string::String,
#[prost(string, tag = "3")]
pub requesting_relay: ::prost::alloc::string::String,
pub sender: ::prost::alloc::string::String,
#[prost(string, tag = "4")]
pub requesting_network: ::prost::alloc::string::String,
pub source_contract_id: ::prost::alloc::string::String,
#[prost(string, tag = "5")]
pub certificate: ::prost::alloc::string::String,
pub source_relay: ::prost::alloc::string::String,
#[prost(string, tag = "6")]
pub requestor_signature: ::prost::alloc::string::String,
pub source_network: ::prost::alloc::string::String,
#[prost(string, tag = "7")]
pub nonce: ::prost::alloc::string::String,
pub destination_relay: ::prost::alloc::string::String,
#[prost(string, tag = "8")]
pub requesting_org: ::prost::alloc::string::String,
#[prost(bool, tag = "9")]
pub confidential: bool,
pub destination_network: ::prost::alloc::string::String,
#[prost(string, tag = "9")]
pub recipient: ::prost::alloc::string::String,
#[prost(string, tag = "10")]
pub destination_contract_id: ::prost::alloc::string::String,
}
/// Generated client implementations.
pub mod network_client {
Expand Down
21 changes: 11 additions & 10 deletions weaver/common/protos/networks/networks.proto
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,14 @@ message NetworkEventUnsubscription {
}

message NetworkAssetTransfer {
repeated string policy = 1;
string address = 2;
string requesting_relay = 3;
string requesting_network = 4;
string certificate = 5;
string requestor_signature = 6;
string nonce = 7;
string requesting_org = 8;
bool confidential = 9;
}
string asset_type = 1;
string asset_id = 2;
string sender = 3;
string source_contract_id = 4;
string source_relay = 5;
string source_network = 6;
string destination_relay = 7;
string destination_network = 8;
string recipient = 9;
string destination_contract_id = 10;
}
3 changes: 2 additions & 1 deletion weaver/core/drivers/fabric-driver/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ cacti-weaver-sdk-fabric
wallet-network1/*.id
!wallet-network1/relay.id
wallet-network2/*.id
!wallet-network2/relay.id
!wallet-network2/relay.id
satp_info.txt
Loading

0 comments on commit 9f77871

Please sign in to comment.