From 7ab0c44b488f441b31a8ef5dedd9ba9d2358ad78 Mon Sep 17 00:00:00 2001 From: Takuma TAKEUCHI Date: Mon, 4 Oct 2021 17:01:29 +0900 Subject: [PATCH] fix(tools): fix the wallet config of fabcar chaincode on tools/docker/fabric ledger Signed-off-by: Takuma TAKEUCHI --- .../script-start-docker.sh | 22 +++++++++++++++---- ...ba34711c73899d182951ec634fcc918855738-priv | 5 ----- .../wallet/admin/admin | 1 - ...8e1df521c6ba8b78e43a2eedc7fe152c3d407-priv | 5 ----- ...f8e1df521c6ba8b78e43a2eedc7fe152c3d407-pub | 4 ---- ...ba34711c73899d182951ec634fcc918855738-priv | 5 ----- ...2ba34711c73899d182951ec634fcc918855738-pub | 4 ---- .../wallet/user1/user1 | 1 - 8 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 tools/docker/fabric14-fabcar-testnet/wallet/admin/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv delete mode 100644 tools/docker/fabric14-fabcar-testnet/wallet/admin/admin delete mode 100644 tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-priv delete mode 100644 tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-pub delete mode 100644 tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv delete mode 100644 tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-pub delete mode 100644 tools/docker/fabric14-fabcar-testnet/wallet/user1/user1 diff --git a/tools/docker/fabric14-fabcar-testnet/script-start-docker.sh b/tools/docker/fabric14-fabcar-testnet/script-start-docker.sh index da13c850cb..6ffb5b2c0a 100755 --- a/tools/docker/fabric14-fabcar-testnet/script-start-docker.sh +++ b/tools/docker/fabric14-fabcar-testnet/script-start-docker.sh @@ -1,10 +1,24 @@ +# Copyright 2020-2021 Hyperledger Cactus Contributors +# SPDX-License-Identifier: Apache-2.0 echo "[process] start docker environment for Fabric testnet" -curl -sSL https://bit.ly/2ysbOFE | bash -s -- 1.4.12 1.4.9 0.4.22 -cp -a wallet fabric-samples/fabcar/javascript -cp -a wallet ../../../examples/cartrade/script-test-getFunctions/fabric +curl -sSL https://bit.ly/2ysbOFE | bash -s -- 1.4.1 1.4.1 0.4.22 + +if [ -d fabric-samples/fabcar/javascript/wallet ]; then + rm -r fabric-samples/fabcar/javascript/wallet +fi +if [ -d ../../../packages/cactus-plugin-ledger-connector-fabric-socketio/wallet ]; then + rm -r ../../../packages/cactus-plugin-ledger-connector-fabric-socketio/wallet +fi +if [ -d ../../../examples/cartrade/script-test-getFunctions/fabric/wallet ]; then + rm -r ../../../examples/cartrade/script-test-getFunctions/fabric/wallet +fi +#cp -a wallet fabric-samples/fabcar/javascript +#cp -a wallet ../../../examples/cartrade/script-test-getFunctions/fabric cd fabric-samples/fabcar ./startFabric.sh cd javascript npm install node enrollAdmin.js -node registerUser.js \ No newline at end of file +node registerUser.js +cp -a wallet ../../../../../../packages/cactus-plugin-ledger-connector-fabric-socketio +cp -a wallet ../../../../../../examples/cartrade/script-test-getFunctions/fabric/wallet \ No newline at end of file diff --git a/tools/docker/fabric14-fabcar-testnet/wallet/admin/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv b/tools/docker/fabric14-fabcar-testnet/wallet/admin/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv deleted file mode 100644 index db8746bcf6..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/wallet/admin/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgpPt9pQjjYIPHH28L -xAwI0ZAv5gVp0FlpVXuAeHfkstWhRANCAAQ2Q0fFCgt+iVPeXF25tvbi+CoMIImg -QL/WXFrUH3BXYTHtm1F4nw7E303lKuMYWH2ZPujqiceNqgeea0kZLNGP ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-fabcar-testnet/wallet/admin/admin b/tools/docker/fabric14-fabcar-testnet/wallet/admin/admin deleted file mode 100644 index a8c651f732..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/wallet/admin/admin +++ /dev/null @@ -1 +0,0 @@ -{"name":"admin","mspid":"Org1MSP","roles":null,"affiliation":"","enrollmentSecret":"","enrollment":{"signingIdentity":"fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407","identity":{"certificate":"-----BEGIN CERTIFICATE-----\nMIICAjCCAaigAwIBAgIUYcAcX63XaN2Omym6hEXF+Kxzx2QwCgYIKoZIzj0EAwIw\nczELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh\nbiBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMT\nE2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMjAwNzI3MTAzNDAwWhcNMjEwNzI3MTAz\nOTAwWjAhMQ8wDQYDVQQLEwZjbGllbnQxDjAMBgNVBAMTBWFkbWluMFkwEwYHKoZI\nzj0CAQYIKoZIzj0DAQcDQgAE0TjOYDQfDbAOU3wYNvxgeaTE/r88BieO5V4yu/6E\nJk4yBHscyaRCnrLZ9eqyFa5+3G5V0mA7hbTw48mdeMArsKNsMGowDgYDVR0PAQH/\nBAQDAgeAMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBMOvw1wPpaBeZIpqc3AFbGs\nY0KMMCsGA1UdIwQkMCKAIEI5qg3NdtruuLoM2nAYUdFFBNMarRst3dusalc2Xkl8\nMAoGCCqGSM49BAMCA0gAMEUCIQDXvckX5bZ5mGPHpQ49aKSFsGJkwrX1BnW7DwA+\n4suQPQIgVGKIiQBQDGlOQHkt9lqno/yFiFZSjzZSS24LFIJNKU4=\n-----END CERTIFICATE-----\n"}}} \ No newline at end of file diff --git a/tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-priv b/tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-priv deleted file mode 100644 index c71cc9de30..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-priv +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQ3pbxM94ZzHPEHW7 -5TQ1N/WfCLSgqY97dfyF34WiJz2hRANCAATROM5gNB8NsA5TfBg2/GB5pMT+vzwG -J47lXjK7/oQmTjIEexzJpEKestn16rIVrn7cblXSYDuFtPDjyZ14wCuw ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-pub b/tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-pub deleted file mode 100644 index 8ac97fcc4b..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/wallet/admin/fde5542b37efe547102f4fe8d0f8e1df521c6ba8b78e43a2eedc7fe152c3d407-pub +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0TjOYDQfDbAOU3wYNvxgeaTE/r88 -BieO5V4yu/6EJk4yBHscyaRCnrLZ9eqyFa5+3G5V0mA7hbTw48mdeMArsA== ------END PUBLIC KEY----- diff --git a/tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv b/tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv deleted file mode 100644 index db8746bcf6..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-priv +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgpPt9pQjjYIPHH28L -xAwI0ZAv5gVp0FlpVXuAeHfkstWhRANCAAQ2Q0fFCgt+iVPeXF25tvbi+CoMIImg -QL/WXFrUH3BXYTHtm1F4nw7E303lKuMYWH2ZPujqiceNqgeea0kZLNGP ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-pub b/tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-pub deleted file mode 100644 index 194b017195..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/wallet/user1/86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738-pub +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAENkNHxQoLfolT3lxdubb24vgqDCCJ -oEC/1lxa1B9wV2Ex7ZtReJ8OxN9N5SrjGFh9mT7o6onHjaoHnmtJGSzRjw== ------END PUBLIC KEY----- diff --git a/tools/docker/fabric14-fabcar-testnet/wallet/user1/user1 b/tools/docker/fabric14-fabcar-testnet/wallet/user1/user1 deleted file mode 100644 index e6496f6215..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/wallet/user1/user1 +++ /dev/null @@ -1 +0,0 @@ -{"name":"user1","mspid":"Org1MSP","roles":null,"affiliation":"","enrollmentSecret":"","enrollment":{"signingIdentity":"86ed77857b77523010fa77e3ae2ba34711c73899d182951ec634fcc918855738","identity":{"certificate":"-----BEGIN CERTIFICATE-----\nMIICjzCCAjWgAwIBAgIUZ7tZrUc30ljAj/wqwn6YQdicE2owCgYIKoZIzj0EAwIw\nczELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh\nbiBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMT\nE2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMjAwNzI3MTAzNDAwWhcNMjEwNzI3MTAz\nOTAwWjBCMTAwDQYDVQQLEwZjbGllbnQwCwYDVQQLEwRvcmcxMBIGA1UECxMLZGVw\nYXJ0bWVudDExDjAMBgNVBAMTBXVzZXIxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD\nQgAENkNHxQoLfolT3lxdubb24vgqDCCJoEC/1lxa1B9wV2Ex7ZtReJ8OxN9N5Srj\nGFh9mT7o6onHjaoHnmtJGSzRj6OB1zCB1DAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0T\nAQH/BAIwADAdBgNVHQ4EFgQUCuQpahuX4zI/56Yuz0SzraMNSxswKwYDVR0jBCQw\nIoAgQjmqDc122u64ugzacBhR0UUE0xqtGy3d26xqVzZeSXwwaAYIKgMEBQYHCAEE\nXHsiYXR0cnMiOnsiaGYuQWZmaWxpYXRpb24iOiJvcmcxLmRlcGFydG1lbnQxIiwi\naGYuRW5yb2xsbWVudElEIjoidXNlcjEiLCJoZi5UeXBlIjoiY2xpZW50In19MAoG\nCCqGSM49BAMCA0gAMEUCIQC1sqCa6OPKOugucF0BLPaXJe/YdA2FVa73gClqL3Yc\nxQIgfQHuZvgeQHol51W3HNIQ1OaqSOqJdtrRZ1rFOdDmvJs=\n-----END CERTIFICATE-----\n"}}} \ No newline at end of file