Merge branch 'main' of https://github.com/zondervancalvez/cactus into…

… zondervancalvez/issue1775
hyperledger-cacti · Feb 24, 2022 · fec71ff · fec71ff
2 parents d338cb0 + 1ae6f72
commit fec71ff
Show file tree

Hide file tree

Showing 125 changed files with 575 additions and 5,561 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,19 +1,4 @@
-
-# !packages/cactus-*/**
-# !examples/cactus-*/**
-
-# examples/cartrade/
-# packages/business-logic-plugin/
-# packages/ledger-plugin/
-# packages/routing-interface/
-# packages/config/
-
 **/dist/**
-# **/node_modules/**
-# **/build/**
-# **/coverage/**
-
-# typings/**
 
 **/src/main/typescript/generated/proto/**
 **/src/main/typescript/generated/wasm-pack/**

diff --git a/.gitignore b/.gitignore
@@ -61,4 +61,3 @@ site/
 !packages/cactus-plugin-verifier-cc/src/main/typescript/ledger-plugin/*/validator/src/core/bin
 
 tools/docker/geth-testnet/data-geth1/
-examples/cactus-example-verifier-cc-cartrade/src/main/typescript/impl/script-test-getFunctions/fabric/wallet/
diff --git a/README.md b/README.md
@@ -40,9 +40,9 @@ As blockchain technology proliferates, blockchain integration will become an inc
 
 Once the last command has finished executing, open link printed on the console with a web browser of your choice
 
-### Car Trade Example
+### Discounted Car Trade Example
 
-- The guidance is [here](./examples/cartrade/README.md).
+- The guidance is [here](./examples/discounted-cartrade/README.md).
 
 ### Electricity Trade Example
 

diff --git a/etc/cactus/default.yaml b/etc/cactus/default.yaml
diff --git a/etc/cactus/usersetting.yaml b/etc/cactus/usersetting.yaml
diff --git a/etc/cactus/validator-registry-config.yaml b/etc/cactus/validator-registry-config.yaml
diff --git a/examples/cactus-example-carbon-accounting-frontend/package.json b/examples/cactus-example-carbon-accounting-frontend/package.json
@@ -50,7 +50,7 @@
     "https-browserify": "1.0.0",
     "jasmine-core": "3.8.0",
     "jasmine-spec-reporter": "7.0.0",
-    "karma": "6.3.4",
+    "karma": "6.3.14",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "3.0.3",
     "karma-jasmine": "4.0.1",

diff --git a/examples/cactus-example-supply-chain-frontend/package.json b/examples/cactus-example-supply-chain-frontend/package.json
@@ -51,7 +51,7 @@
     "constants-browserify": "1.0.0",
     "jasmine-core": "3.8.0",
     "jasmine-spec-reporter": "7.0.0",
-    "karma": "6.3.4",
+    "karma": "6.3.14",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "3.0.3",
     "karma-jasmine": "4.0.1",

diff --git a/examples/cartrade/.gitignore b/examples/cartrade/.gitignore
diff --git a/examples/cartrade/AssetManagement.ts b/examples/cartrade/AssetManagement.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,4 +61,3 @@ site/
		!packages/cactus-plugin-verifier-cc/src/main/typescript/ledger-plugin/*/validator/src/core/bin

		tools/docker/geth-testnet/data-geth1/
		examples/cactus-example-verifier-cc-cartrade/src/main/typescript/impl/script-test-getFunctions/fabric/wallet/