diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json
index 0a4382ca5f5..ebe9fb8f966 100644
--- a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json
+++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json
@@ -1,6 +1,6 @@
{
"name": "@hyperledger/cactus-plugin-ledger-connector-fabric-socketio",
- "version": "1.0.0",
+ "version": "1.0.0-rc.3",
"license": "Apache-2.0",
"scripts": {
"start": "cd ./dist && node common/core/bin/www.js",
@@ -16,15 +16,15 @@
"config": "3.3.7",
"cookie-parser": "1.4.6",
"debug": "4.1.1",
- "express": "4.15.5",
+ "express": "4.17.1",
"fabric-ca-client": "1.4.19",
"fabric-client": "1.4.19",
"fabric-network": "1.4.19",
"fast-safe-stringify": "2.1.1",
"js-yaml": "3.14.1",
+ "morgan": "1.10.0",
"jsonwebtoken": "8.5.1",
"log4js": "6.4.1",
- "morgan": "1.10.0",
"serve-favicon": "2.4.5",
"shelljs": "0.8.5",
"socket.io": "4.4.1"
@@ -33,4 +33,4 @@
"@types/config": "0.0.41",
"ts-node": "9.1.1"
}
-}
+}
\ No newline at end of file
diff --git a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json
index 5f82ed55636..905ed177fba 100644
--- a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json
+++ b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/package.json
@@ -1,6 +1,6 @@
{
"name": "@hyperledger/cactus-plugin-ledger-connector-sawtooth-socketio",
- "version": "1.0.0",
+ "version": "1.0.0-rc.3",
"license": "Apache-2.0",
"scripts": {
"start": "cd ./dist && node common/core/bin/www.js",
@@ -17,17 +17,17 @@
"config": "3.3.7",
"cookie-parser": "1.4.6",
"debug": "4.1.1",
- "express": "4.15.5",
+ "express": "4.17.1",
"js-yaml": "3.14.1",
"jsonwebtoken": "8.5.1",
"log4js": "6.4.1",
"morgan": "1.10.0",
"serve-favicon": "2.4.5",
"shelljs": "0.8.5",
- "socket.io": "4.4.1",
+ "socket.io": "4.1.1",
"xmlhttprequest": "1.8.0"
},
"devDependencies": {
"@types/config": "0.0.41"
}
-}
+}
\ No newline at end of file
diff --git a/whitepaper/authorizationPermissionedChains.png b/whitepaper/authorizationPermissionedChains.png
new file mode 100644
index 00000000000..5a01280411b
Binary files /dev/null and b/whitepaper/authorizationPermissionedChains.png differ
diff --git a/whitepaper/deployIntegrationFramework.png b/whitepaper/deployIntegrationFramework.png
new file mode 100644
index 00000000000..b79af9f71b9
Binary files /dev/null and b/whitepaper/deployIntegrationFramework.png differ
diff --git a/whitepaper/documentStorageDeploymentDiag.png b/whitepaper/documentStorageDeploymentDiag.png
new file mode 100644
index 00000000000..64daaadec77
Binary files /dev/null and b/whitepaper/documentStorageDeploymentDiag.png differ
diff --git a/whitepaper/escrowedSaleDataforCoins.png b/whitepaper/escrowedSaleDataforCoins.png
new file mode 100644
index 00000000000..448d4d5309a
Binary files /dev/null and b/whitepaper/escrowedSaleDataforCoins.png differ
diff --git a/whitepaper/exampleCoinPeggedtoBitcoin.png b/whitepaper/exampleCoinPeggedtoBitcoin.png
new file mode 100644
index 00000000000..0d98dc987fe
Binary files /dev/null and b/whitepaper/exampleCoinPeggedtoBitcoin.png differ
diff --git a/whitepaper/foodTraceIntegration2.png b/whitepaper/foodTraceIntegration2.png
new file mode 100644
index 00000000000..df2f011c841
Binary files /dev/null and b/whitepaper/foodTraceIntegration2.png differ
diff --git a/whitepaper/foodTraceIntergration.png b/whitepaper/foodTraceIntergration.png
new file mode 100644
index 00000000000..4c8ef4188c2
Binary files /dev/null and b/whitepaper/foodTraceIntergration.png differ
diff --git a/whitepaper/healthcareDataSharingwithAccessControlList.png b/whitepaper/healthcareDataSharingwithAccessControlList.png
new file mode 100644
index 00000000000..cf16c198df6
Binary files /dev/null and b/whitepaper/healthcareDataSharingwithAccessControlList.png differ
diff --git a/whitepaper/hyperledgerBCIntegrationFramework.png b/whitepaper/hyperledgerBCIntegrationFramework.png
new file mode 100644
index 00000000000..a21ec3a85ce
Binary files /dev/null and b/whitepaper/hyperledgerBCIntegrationFramework.png differ
diff --git a/whitepaper/integration-framework-client-side-transaction-signing.png b/whitepaper/integration-framework-client-side-transaction-signing.png
new file mode 100644
index 00000000000..66dee0ac67b
Binary files /dev/null and b/whitepaper/integration-framework-client-side-transaction-signing.png differ
diff --git a/whitepaper/integration-framework-plugin-architecture.png b/whitepaper/integration-framework-plugin-architecture.png
new file mode 100644
index 00000000000..9f41d9dba4b
Binary files /dev/null and b/whitepaper/integration-framework-plugin-architecture.png differ
diff --git a/whitepaper/integration-framework-server-side-transaction-signing.png b/whitepaper/integration-framework-server-side-transaction-signing.png
new file mode 100644
index 00000000000..082f6d1108f
Binary files /dev/null and b/whitepaper/integration-framework-server-side-transaction-signing.png differ
diff --git a/whitepaper/integration-framework-unified-identity-management.png b/whitepaper/integration-framework-unified-identity-management.png
new file mode 100644
index 00000000000..d74beddcc92
Binary files /dev/null and b/whitepaper/integration-framework-unified-identity-management.png differ
diff --git a/whitepaper/whitepaper.md b/whitepaper/whitepaper.md
index 5aa3a16cac7..7bc5dc62d6f 100644
--- a/whitepaper/whitepaper.md
+++ b/whitepaper/whitepaper.md
@@ -464,7 +464,7 @@ The following table summarizes the use cases that will be explained in more deta
| Comments | Hyperledger Private Data: https://hyperledger-fabric.readthedocs.io/en/release-1.4/private_data_tutorial.html
Besu Privacy Groups: https://besu.hyperledger.org/en/stable/Concepts/Privacy/Privacy-Groups/ |
-
+
## 3.6 Money Exchanges
@@ -499,7 +499,7 @@ onto their ExampleCoin wallet on the other network.
An ExampleCoin holder can redeem their funds to BTC by receiving a Proof of Burn on the ExampleCoin ledger and getting sent the matching amount of BTC from the `ExampleCoin Reserve Wallet` to their BTC wallet.
-
+
### 3.7.2 With Fiat Money (USD)
@@ -524,7 +524,7 @@ gets replaced by a traditional bank account holding USD.
| Prerequisites | `User A` and `User B` are registered on a ledger or two separate ledgers that support the concept of individual data ownership, access controls and sharing. |
| Comments | It makes most sense for best privacy if `User A` and `User B` are both present with an identity on the same permissioned, privacy-enabled ledger rather than on two separate ones. This gives `User A` an additional layer of security since they can know that their data is still only stored on one ledger instead of two (albeit both being privacy-enabled)|
-
+
## 3.9 Integrate Existing Food Traceability Solutions
@@ -543,11 +543,11 @@ gets replaced by a traditional bank account holding USD.
| Prerequisites | 1. `Organization A` and `Organization B` are both signed up for blockchain enabled software services that provide end to end food traceability solutions on their own but require all participants in the chain to use a single solution in order to work.
2. Both solutions of `Organization A` and `B` have terms and conditions such that it is possible technically and legally to integrate the software with each other and `Cactus`. |
| Comments | |
-
+
---
-
+
@@ -571,7 +571,7 @@ gets replaced by a traditional bank account holding USD.
---
-
+
@@ -1169,7 +1169,7 @@ Provides structured or unstructured document storage and analytics capabilities
Comes with its own API surface that serves as an adapter for different storage backends via plugins.
By default, `Open Distro for ElasticSearch` is used as the storage backend: https://aws.amazon.com/blogs/aws/new-open-distro-for-elasticsearch/
-
+
> The API surface provided by this package is kept intentionally simple and feature-poor so that different underlying storage backends remain an option long term through the plugin architecture of `Cactus`.
@@ -1189,11 +1189,11 @@ Contains components responsible for providing access to immutable storage such a
Source file: `./docs/architecture/deployment-diagram.puml`
-
+
### 5.4.3 Component Diagram
-
+
### 5.4.4 Class Diagram
@@ -1239,7 +1239,7 @@ An overarching theme for all aspects that are covered by the plugin architecture
---
-
+
---
@@ -1546,7 +1546,7 @@ Usually a better fit for consumer-based applications where end users have higher
---
-
+
---
@@ -1563,7 +1563,7 @@ Usually a better fit for enterprise applications where end users have most likel
---
-
+
---
@@ -1585,7 +1585,7 @@ Example: A user can register for a Hyperledger Cactus account, import their priv
> Native mobile applications may not need to use the server-side keychain since they usually come equipped with an OS provided one (Android, iOS does).
-
+
In web 2.0 applications the prevalent authentication/authorization solution is Open ID Connect which bases authentication on passwords and tokens which are derived from the passwords.
Web 3.0 applications (decentralized apps or *DApps*) which interact with blockchain networks rely on private keys instead of passwords.