Skip to content

Commit

Permalink
fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…
Browse files Browse the repository at this point in the history 
…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
  • Loading branch information
@outSH
outSH committed Jan 20, 2022
1 parent 3a1c362 commit 67fbb63
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 106 deletions.
4 changes: 2 additions & 2 deletions examples/cartrade/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "^1.4.0",
"fabric-network": "^1.4.0",
"http-errors": "~1.6.3",
"jsonwebtoken": "^8.5.1",
"log4js": "^3.0.6",
Expand Down
6 changes: 3 additions & 3 deletions examples/discounted-cartrade/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-client": "~1.4.0",
"fabric-ca-client": "^1.4.0",
"fabric-network": "^1.4.0",
"fabric-client": "^1.4.0",
"http-errors": "~1.6.3",
"indy-sdk": "^1.16.0-dev-1636",
"jsonwebtoken": "^8.5.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/cactus-cmd-socketio-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"fabric-ca-client": "^1.4.0",
"fabric-network": "^1.4.0",
"http-errors": "~1.6.3",
"jsonwebtoken": "^8.5.1",
"log4js": "^3.0.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/cactus-plugin-ledger-connector-fabric-socketio/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"cookie-parser": "~1.4.3",
"debug": "~4.1.1",
"express": "~4.15.2",
"fabric-ca-client": "~1.4.0",
"fabric-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "^1.4.0",
"fabric-client": "^1.4.0",
"fabric-network": "^1.4.0",
"jsonwebtoken": "^8.5.1",
"log4js": "^3.0.6",
"morgan": "~1.8.1",
Expand Down
129 changes: 33 additions & 96 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8881,7 +8881,7 @@ detect-indent@^6.0.0:
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==

detect-libc@^1.0.2, detect-libc@^1.0.3:
detect-libc@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
Expand Down Expand Up @@ -10543,16 +10543,15 @@ eyes@0.1.x:
resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=

fabric-ca-client@1.4.18, fabric-ca-client@~1.4.0:
version "1.4.18"
resolved "https://registry.yarnpkg.com/fabric-ca-client/-/fabric-ca-client-1.4.18.tgz#ee9efe0fd4809c6052af19d3a834d6953dbab95a"
integrity sha512-OklEHXkY93Z4voT044ZY0le9iqPLHYMvU44oDd7bZxFkgAixEUPwWOGr9VjfDyeQdZlU9I3IMgtiK5V4SK7XeA==
fabric-ca-client@1.4.19, fabric-ca-client@^1.4.0:
version "1.4.19"
resolved "https://registry.yarnpkg.com/fabric-ca-client/-/fabric-ca-client-1.4.19.tgz#d2e13480d3d6139f41ae30c6ab908a6b9c8f2420"
integrity sha512-YX74Kme1jr21s8YlTAHaCOKYnX6GWBqtpsCUPTsoxoQcBkHcfxSOKA+wgUoj26T0+SJLmcgcYrGrBdeg/Nawpw==
dependencies:
grpc "1.24.3"
jsrsasign "^8.0.20"
grpc "1.24.11"
jsrsasign "^10.4.1"
lodash.clone "4.5.0"
url "^0.11.0"
util "^0.10.3"
winston "^2.4.0"

fabric-ca-client@2.2.10:
Expand All @@ -10575,32 +10574,32 @@ fabric-ca-client@2.3.0-snapshot.62:
url "^0.11.0"
winston "^2.4.5"

fabric-client@1.4.18, fabric-client@~1.4.0:
version "1.4.18"
resolved "https://registry.yarnpkg.com/fabric-client/-/fabric-client-1.4.18.tgz#d124bd57be4763a93478bfdf9231169834cdaf61"
integrity sha512-gs3BkGbl+KAeu0H0s108eTXVcOiwJJaZpRcGqZt3DoiC5rwHipVERx/OH+bmZxoL7o8aaUEw8JkA+SmDqCh5BA==
fabric-client@1.4.19, fabric-client@^1.4.0:
version "1.4.19"
resolved "https://registry.yarnpkg.com/fabric-client/-/fabric-client-1.4.19.tgz#5387de0026981c597a5d7a5f4372ae1715304982"
integrity sha512-D2Kk+MzNLjbG1+vlhI1tn7nFjs/HHqF4a900Mi4vQ7ECD0TQ7uvrEngrWfBImRd8TYwMDnthZc2UJpwjoUQeTQ==
dependencies:
"@types/bytebuffer" "^5.0.34"
bn.js "^4.11.3"
bytebuffer "^5.0.1"
callsite "^1.0.0"
elliptic "^6.5.4"
fabric-ca-client "1.4.18"
fabric-ca-client "1.4.19"
fs-extra "^8.1.0"
grpc "1.24.3"
grpc "1.24.11"
ignore-walk "^3.0.0"
js-sha3 "^0.7.0"
js-yaml "^3.9.0"
jsrsasign "^8.0.20"
klaw "^2.0.0"
jsrsasign "^10.4.1"
klaw "^4.0.1"
lodash.clone "4.5.0"
long "^4.0.0"
nano "^6.4.4"
nconf "^0.10.0"
promise-settle "^0.3.0"
protobufjs "5.0.3"
sjcl "1.0.7"
tar-stream "2.1.4"
tar-stream "^2.2.0"
url "^0.11.0"
winston "^2.4.0"
optionalDependencies:
Expand Down Expand Up @@ -10664,13 +10663,13 @@ fabric-network@2.3.0-snapshot.62:
long "^4.0.0"
nano "^9.0.3"

fabric-network@~1.4.0:
version "1.4.18"
resolved "https://registry.yarnpkg.com/fabric-network/-/fabric-network-1.4.18.tgz#fee924144cf9f67df38b1d3a13550fa008ac940c"
integrity sha512-cUyaazfqztBcf5Lh9v59q6e1D1J8cPe1qVSNhk79d9BKkQtMoSIfMEL6UXqyP/yfo2qC3Dhlts8I0Ej51Her4A==
fabric-network@^1.4.0:
version "1.4.19"
resolved "https://registry.yarnpkg.com/fabric-network/-/fabric-network-1.4.19.tgz#893f36d8a3b8a58687ee50459ce6d0aa24982c35"
integrity sha512-A1Y445QvH8ZS/4eCme+GvQbAh2aDQx0CtwjBMCoUufZ2+IigFP6mRsHALEykiDQGwmZyqtcDcrD9QrgvhV7ofg==
dependencies:
fabric-ca-client "1.4.18"
fabric-client "1.4.18"
fabric-ca-client "1.4.19"
fabric-client "1.4.19"
nano "^6.4.4"
rimraf "^2.6.2"
winston "^2.4.0"
Expand Down Expand Up @@ -11822,18 +11821,6 @@ grpc@1.24.11:
nan "^2.13.2"
protobufjs "^5.0.3"

grpc@1.24.3:
version "1.24.3"
resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.3.tgz#92efe28dfc1250dca179b8133e40b4f2341473d9"
integrity sha512-EDemzuZTfhM0hgrXqC4PtR76O3t+hTIYJYR5vgiW0yt2WJqo4mhxUqZUirzUQz34Psz7dbLp38C6Cl7Ij2vXRQ==
dependencies:
"@types/bytebuffer" "^5.0.40"
lodash.camelcase "^4.3.0"
lodash.clone "^4.5.0"
nan "^2.13.2"
node-pre-gyp "^0.15.0"
protobufjs "^5.0.3"

grpc_tools_node_protoc_ts@5.3.1:
version "5.3.1"
resolved "https://registry.yarnpkg.com/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.3.1.tgz#6f81ab7c8289c801cba3373aa334c13ca8f29618"
Expand Down Expand Up @@ -12393,7 +12380,7 @@ ignore-by-default@^1.0.1:
resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=

ignore-walk@3.0.4, ignore-walk@^3.0.0, ignore-walk@^3.0.1, ignore-walk@^3.0.3:
ignore-walk@3.0.4, ignore-walk@^3.0.0, ignore-walk@^3.0.3:
version "3.0.4"
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
Expand Down Expand Up @@ -14520,11 +14507,6 @@ jsrsasign@^10.4.1:
resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.0.tgz#28acf0dbe7565633d306190fd9400c38dd862cb0"
integrity sha512-AC1kfL1LJASKBLGv4bLLl+auFlsBajOxEcggL7fn8cp7nMRPhyln3LK/Q9lEDCrxYFU35NGUeFtUBCbasoF2Uw==

jsrsasign@^8.0.20:
version "8.0.24"
resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-8.0.24.tgz#fc26bac45494caac3dd8f69c1f95847c4bda6c83"
integrity sha512-u45jAyusqUpyGbFc2IbHoeE4rSkoBWQgLe/w99temHenX+GyCz4nflU5sjK7ajU1ffZTezl6le7u43Yjr/lkQg==

jszip@^3.1.3:
version "3.7.1"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
Expand Down Expand Up @@ -14782,12 +14764,10 @@ klaw@^1.0.0:
optionalDependencies:
graceful-fs "^4.1.9"

klaw@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/klaw/-/klaw-2.1.1.tgz#42b76894701169cc910fd0d19ce677b5fb378af1"
integrity sha1-QrdolHARacyRD9DRnOZ3tfs3ivE=
dependencies:
graceful-fs "^4.1.9"
klaw@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/klaw/-/klaw-4.0.1.tgz#8dc6f5723f05894e8e931b516a8ff15c2976d368"
integrity sha512-pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw==

kleur@^3.0.3:
version "3.0.3"
Expand Down Expand Up @@ -16373,7 +16353,7 @@ nconf@^0.11.2:
secure-keys "^1.0.0"
yargs "^16.1.1"

needle@^2.5.0, needle@^2.5.2:
needle@^2.5.2:
version "2.9.1"
resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684"
integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
Expand Down Expand Up @@ -16549,22 +16529,6 @@ node-polyfill-webpack-plugin@1.1.4:
util "^0.12.4"
vm-browserify "^1.1.2"

node-pre-gyp@^0.15.0:
version "0.15.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087"
integrity sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==
dependencies:
detect-libc "^1.0.2"
mkdirp "^0.5.3"
needle "^2.5.0"
nopt "^4.0.1"
npm-packlist "^1.1.6"
npmlog "^4.0.2"
rc "^1.2.7"
rimraf "^2.6.1"
semver "^5.3.0"
tar "^4.4.2"

node-preload@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
Expand Down Expand Up @@ -16690,7 +16654,7 @@ normalize-url@^6.0.1, normalize-url@^6.1.0:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==

npm-bundled@^1.0.1, npm-bundled@^1.1.1:
npm-bundled@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
Expand Down Expand Up @@ -16740,15 +16704,6 @@ npm-package-arg@8.1.5, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-packa
semver "^7.3.4"
validate-npm-package-name "^3.0.0"

npm-packlist@^1.1.6:
version "1.4.8"
resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
dependencies:
ignore-walk "^3.0.1"
npm-bundled "^1.0.1"
npm-normalize-package-bin "^1.0.1"

npm-packlist@^2.1.4:
version "2.2.2"
resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
Expand Down Expand Up @@ -16832,7 +16787,7 @@ npm-watch@0.11.0:
nodemon "^2.0.7"
through2 "^4.0.2"

npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
npmlog@^4.0.1, npmlog@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
Expand Down Expand Up @@ -19560,7 +19515,7 @@ rfdc@^1.1.2, rfdc@^1.1.4:
resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==

rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3:
version "2.7.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
Expand Down Expand Up @@ -21338,18 +21293,7 @@ tar-fs@~2.0.1:
pump "^3.0.0"
tar-stream "^2.0.0"

tar-stream@2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
dependencies:
bl "^4.0.3"
end-of-stream "^1.4.1"
fs-constants "^1.0.0"
inherits "^2.0.3"
readable-stream "^3.1.1"

tar-stream@2.2.0, tar-stream@^2.0.0, tar-stream@^2.1.4:
tar-stream@2.2.0, tar-stream@^2.0.0, tar-stream@^2.1.4, tar-stream@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
Expand All @@ -21373,7 +21317,7 @@ tar-stream@^1.5.2:
to-buffer "^1.1.1"
xtend "^4.0.0"

tar@^4.0.2, tar@^4.4.12, tar@^4.4.2:
tar@^4.0.2, tar@^4.4.12:
version "4.4.19"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
Expand Down Expand Up @@ -22446,13 +22390,6 @@ util.promisify@^1.0.1:
has-symbols "^1.0.1"
object.getownpropertydescriptors "^2.1.1"

util@^0.10.3:
version "0.10.4"
resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
dependencies:
inherits "2.0.3"

util@^0.12.0, util@^0.12.4:
version "0.12.4"
resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
Expand Down

0 comments on commit 67fbb63

Please sign in to comment.