From e4062c3088fd7eef1b2bfacdd81297040f0ad111 Mon Sep 17 00:00:00 2001 From: Sanket Teli Date: Tue, 3 Dec 2024 12:45:53 +0530 Subject: [PATCH] updated the snapshots Signed-off-by: Sanket Teli --- e2e/__snapshots__/extendConfig.test.ts.snap | 2147 +++++++++++++++++ ...1chaincode-raft-explorer.json.test.ts.snap | 40 +- ...fig-hlf2-1org-1chaincode.json.test.ts.snap | 36 +- ...2chaincodes-private-data.yaml.test.ts.snap | 41 +- ...2-2orgs-2chaincodes-raft.yaml.test.ts.snap | 99 +- ...1chaincode-raft-explorer.json.test.ts.snap | 160 +- e2e/__snapshots__/fabloCommands.test.ts.snap | 56 + e2e/__snapshots__/schema.test.ts.snap | 1 + samples/invalid-fablo-config.json | 67 + 9 files changed, 2498 insertions(+), 149 deletions(-) create mode 100644 samples/invalid-fablo-config.json diff --git a/e2e/__snapshots__/extendConfig.test.ts.snap b/e2e/__snapshots__/extendConfig.test.ts.snap index a926ccf3..84c005f6 100644 --- a/e2e/__snapshots__/extendConfig.test.ts.snap +++ b/e2e/__snapshots__/extendConfig.test.ts.snap @@ -103,6 +103,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -114,6 +115,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -126,6 +128,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -139,6 +142,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -435,6 +439,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -446,6 +451,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -458,6 +464,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -471,6 +478,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -603,6 +611,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "orderedHeadsDistinct": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -623,6 +632,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -634,6 +644,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -646,6 +657,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -692,6 +704,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -704,6 +717,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -914,6 +928,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -925,6 +940,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -937,6 +953,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -950,6 +967,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1246,6 +1264,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1257,6 +1276,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1269,6 +1289,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1282,6 +1303,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1414,6 +1436,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "orderedHeadsDistinct": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1434,6 +1457,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1445,6 +1469,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1457,6 +1482,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1503,6 +1529,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1515,6 +1542,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1720,6 +1748,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1731,6 +1760,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1743,6 +1773,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -1756,6 +1787,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2037,6 +2069,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2048,6 +2081,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2060,6 +2094,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2073,6 +2108,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2205,6 +2241,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "orderedHeadsDistinct": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2225,6 +2262,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2236,6 +2274,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2248,6 +2287,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2294,6 +2334,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2306,6 +2347,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2511,6 +2553,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2522,6 +2565,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2534,6 +2578,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2547,6 +2592,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2915,6 +2961,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2926,6 +2973,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2938,6 +2986,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -2951,6 +3000,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3320,6 +3370,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3331,6 +3382,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3343,6 +3395,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3356,6 +3409,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3551,6 +3605,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "orderedHeadsDistinct": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3571,6 +3626,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3582,6 +3638,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3594,6 +3651,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3640,6 +3698,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3652,6 +3711,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -3930,6 +3990,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -3941,6 +4002,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -3953,6 +4015,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -3963,6 +4026,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer1.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer1.group1.orderer1.com:7031", @@ -3973,6 +4037,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer2.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer2.group1.orderer1.com:7032", @@ -3986,6 +4051,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4371,6 +4437,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4382,6 +4449,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4394,6 +4462,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4404,6 +4473,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer1.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer1.group1.orderer1.com:7031", @@ -4414,6 +4484,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer2.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer2.group1.orderer1.com:7032", @@ -4427,6 +4498,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4813,6 +4885,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4824,6 +4897,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4836,6 +4910,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -4846,6 +4921,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer1.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer1.group1.orderer1.com:7031", @@ -4856,6 +4932,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer2.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer2.group1.orderer1.com:7032", @@ -4869,6 +4946,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5152,6 +5230,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5163,6 +5242,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5175,6 +5255,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5185,6 +5266,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer1.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer1.group1.orderer1.com:7031", @@ -5195,6 +5277,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer2.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer2.group1.orderer1.com:7032", @@ -5208,6 +5291,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5503,6 +5587,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "name": "group2", "ordererHead": { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5514,6 +5599,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5526,6 +5612,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5539,6 +5626,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, "ordererHead": { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5775,6 +5863,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderedHeadsDistinct": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5785,6 +5874,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5805,6 +5895,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5816,6 +5907,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5828,6 +5920,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5838,6 +5931,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer1.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer1.group1.orderer1.com:7031", @@ -5848,6 +5942,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer2.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer2.group1.orderer1.com:7032", @@ -5869,6 +5964,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "name": "group2", "ordererHead": { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5880,6 +5976,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5892,6 +5989,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -5938,6 +6036,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5950,6 +6049,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer0.group1.orderer1.com:7030", @@ -5960,6 +6060,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer1.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer1.group1.orderer1.com:7031", @@ -5970,6 +6071,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] }, { "address": "orderer2.group1.orderer1.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer1.com", "fullAddress": "orderer2.group1.orderer1.com:7032", @@ -6019,6 +6121,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "ordererHeads": [ { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -6031,6 +6134,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] "orderers": [ { "address": "orderer0.group2.orderer2.com", + "adminPort": 7053, "consensus": "solo", "domain": "orderer2.com", "fullAddress": "orderer0.group2.orderer2.com:7050", @@ -6316,6 +6420,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6328,6 +6433,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6338,6 +6444,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -6393,6 +6500,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -6404,6 +6512,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -6414,6 +6523,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6424,6 +6534,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -6434,6 +6545,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -6446,6 +6558,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -6456,6 +6569,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer1.group1.orderer.example.com:7031", @@ -6466,6 +6580,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6476,6 +6591,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -6486,6 +6602,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -6496,6 +6613,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -6506,6 +6624,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -6516,6 +6635,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer1.group1.org3.example.com:7091", @@ -6529,6 +6649,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -6607,6 +6728,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6619,6 +6741,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6629,6 +6752,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -6745,6 +6869,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6757,6 +6882,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6767,6 +6893,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -6886,6 +7013,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6898,6 +7026,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6908,6 +7037,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -6963,6 +7093,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -6974,6 +7105,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -6984,6 +7116,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -6994,6 +7127,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7004,6 +7138,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -7016,6 +7151,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7026,6 +7162,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer1.group1.orderer.example.com:7031", @@ -7036,6 +7173,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7046,6 +7184,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -7056,6 +7195,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7066,6 +7206,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -7076,6 +7217,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -7086,6 +7228,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer1.group1.org3.example.com:7091", @@ -7099,6 +7242,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7177,6 +7321,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7189,6 +7334,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7199,6 +7345,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -7313,6 +7460,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7325,6 +7473,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7335,6 +7484,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -7390,6 +7540,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7401,6 +7552,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7411,6 +7563,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7421,6 +7574,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7431,6 +7585,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -7443,6 +7598,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7453,6 +7609,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer1.group1.orderer.example.com:7031", @@ -7463,6 +7620,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7473,6 +7631,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -7483,6 +7642,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7493,6 +7653,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -7503,6 +7664,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -7513,6 +7675,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer1.group1.org3.example.com:7091", @@ -7526,6 +7689,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7604,6 +7768,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7616,6 +7781,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7626,6 +7792,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -7740,6 +7907,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7752,6 +7920,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7762,6 +7931,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -7817,6 +7987,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7828,6 +7999,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7838,6 +8010,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7848,6 +8021,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7858,6 +8032,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -7870,6 +8045,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -7880,6 +8056,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer1.group1.orderer.example.com:7031", @@ -7890,6 +8067,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -7900,6 +8078,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -7910,6 +8089,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -7920,6 +8100,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -7930,6 +8111,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -7940,6 +8122,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer1.group1.org3.example.com:7091", @@ -7953,6 +8136,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -8031,6 +8215,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -8043,6 +8228,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -8053,6 +8239,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -8163,6 +8350,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -8175,6 +8363,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -8185,6 +8374,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -8267,6 +8457,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderedHeadsDistinct": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -8277,6 +8468,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -8287,6 +8479,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -8297,6 +8490,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -8320,6 +8514,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -8331,6 +8526,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -8341,6 +8537,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -8351,6 +8548,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -8361,6 +8559,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -8373,6 +8572,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -8383,6 +8583,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer1.group1.orderer.example.com:7031", @@ -8393,6 +8594,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -8403,6 +8605,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -8413,6 +8616,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -8423,6 +8627,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -8433,6 +8638,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -8443,6 +8649,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer1.group1.org3.example.com:7091", @@ -8489,6 +8696,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -8501,6 +8709,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -8511,6 +8720,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer1.group1.orderer.example.com:7031", @@ -8596,6 +8806,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -8608,6 +8819,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer0.group1.org1.example.com:7050", @@ -8618,6 +8830,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org1.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org1.example.com", "fullAddress": "orderer1.group1.org1.example.com:7051", @@ -8728,6 +8941,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -8740,6 +8954,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer0.group1.org2.example.com:7070", @@ -8750,6 +8965,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org2.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org2.example.com", "fullAddress": "orderer1.group1.org2.example.com:7071", @@ -8860,6 +9076,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "ordererHeads": [ { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -8872,6 +9089,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. "orderers": [ { "address": "orderer0.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer0.group1.org3.example.com:7090", @@ -8882,6 +9100,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. }, { "address": "orderer1.group1.org3.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "org3.example.com", "fullAddress": "orderer1.group1.org3.example.com:7091", @@ -8927,6 +9146,1920 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer. } `; +exports[`extend config samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = ` +{ + "chaincodes": [ + { + "channel": { + "instantiatingOrg": { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + "name": "my-channel1", + "ordererGroup": { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "etcdraft", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "orgs": [ + { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + ], + "profileName": "MyChannel1", + }, + "directory": "./chaincodes/chaincode-kv-node", + "endorsement": "AND ('Org1MSP.member')", + "init": "{"Args":[]}", + "instantiatingOrg": { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + "lang": "node", + "name": "chaincode1", + "privateData": [], + "privateDataConfigFile": undefined, + "version": "0.0.1", + }, + ], + "channels": [ + { + "instantiatingOrg": { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + "name": "my-channel1", + "ordererGroup": { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "etcdraft", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "orgs": [ + { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + ], + "profileName": "MyChannel1", + }, + ], + "global": { + "capabilities": { + "application": "V2_5", + "channel": "V3_0", + "isV2": false, + "isV3": true, + "orderer": "V2_0", + }, + "engine": "docker", + "fabricBaseosVersion": "3.0.0-beta", + "fabricCaVersion": "1.5.5", + "fabricCcenvVersion": "3.0.0-beta", + "fabricJavaenvVersion": "3.0", + "fabricNodeenvVersion": "3.0", + "fabricRecommendedNodeVersion": "16", + "fabricVersion": "3.0.0-beta", + "monitoring": { + "loglevel": "debug", + }, + "paths": { + "chaincodesBaseDir": "", + "fabloConfig": "", + }, + "tls": true, + "tools": {}, + }, + "hooks": { + "postGenerate": "", + }, + "orderedHeadsDistinct": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "ordererGroups": [ + { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "etcdraft", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + ], + "orgs": [ + { + "anchorPeers": [], + "bootstrapPeers": """", + "ca": { + "address": "ca.orderer.example.com", + "caAdminNameVar": "ORDERER_CA_ADMIN_NAME", + "caAdminPassVar": "ORDERER_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7020, + "fullAddress": "ca.orderer.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.orderer.example.com", + }, + "cryptoConfigFileName": "crypto-config-orderer", + "domain": "orderer.example.com", + "headPeer": undefined, + "mspName": "OrdererMSP", + "name": "Orderer", + "ordererGroups": [ + { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "etcdraft", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "etcdraft", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + ], + "peers": [], + "peersCount": 0, + "tools": {}, + }, + { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + ], +} +`; + +exports[`extend config samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] = ` +{ + "chaincodes": [ + { + "channel": { + "instantiatingOrg": { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + "name": "my-channel1", + "ordererGroup": { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "BFT", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "orgs": [ + { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + ], + "profileName": "MyChannel1", + }, + "directory": "./chaincodes/chaincode-kv-node", + "endorsement": "AND ('Org1MSP.member')", + "init": "{"Args":[]}", + "instantiatingOrg": { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + "lang": "node", + "name": "chaincode1", + "privateData": [], + "privateDataConfigFile": undefined, + "version": "0.0.1", + }, + ], + "channels": [ + { + "instantiatingOrg": { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + "name": "my-channel1", + "ordererGroup": { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "BFT", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "orgs": [ + { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + ], + "profileName": "MyChannel1", + }, + ], + "global": { + "capabilities": { + "application": "V2_5", + "channel": "V3_0", + "isV2": false, + "isV3": true, + "orderer": "V2_0", + }, + "engine": "docker", + "fabricBaseosVersion": "3.0.0-beta", + "fabricCaVersion": "1.5.5", + "fabricCcenvVersion": "3.0.0-beta", + "fabricJavaenvVersion": "3.0", + "fabricNodeenvVersion": "3.0", + "fabricRecommendedNodeVersion": "16", + "fabricVersion": "3.0.0-beta", + "monitoring": { + "loglevel": "debug", + }, + "paths": { + "chaincodesBaseDir": "", + "fabloConfig": "", + }, + "tls": true, + "tools": {}, + }, + "hooks": { + "postGenerate": "", + }, + "orderedHeadsDistinct": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "ordererGroups": [ + { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "BFT", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHead": { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + ], + "orgs": [ + { + "anchorPeers": [], + "bootstrapPeers": """", + "ca": { + "address": "ca.orderer.example.com", + "caAdminNameVar": "ORDERER_CA_ADMIN_NAME", + "caAdminPassVar": "ORDERER_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7020, + "fullAddress": "ca.orderer.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.orderer.example.com", + }, + "cryptoConfigFileName": "crypto-config-orderer", + "domain": "orderer.example.com", + "headPeer": undefined, + "mspName": "OrdererMSP", + "name": "Orderer", + "ordererGroups": [ + { + "configtxOrdererDefaults": "Group1Defaults", + "consensus": "BFT", + "genesisBlockName": "Group1Genesis.block", + "hostingOrgs": [ + "Orderer", + ], + "name": "group1", + "ordererHeads": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + ], + "orderers": [ + { + "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer0.group1.orderer.example.com:7030", + "name": "orderer0.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7030, + }, + { + "address": "orderer1.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer1.group1.orderer.example.com:7031", + "name": "orderer1.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7031, + }, + { + "address": "orderer2.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer2.group1.orderer.example.com:7032", + "name": "orderer2.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7032, + }, + { + "address": "orderer3.group1.orderer.example.com", + "adminPort": 7053, + "consensus": "BFT", + "domain": "orderer.example.com", + "fullAddress": "orderer3.group1.orderer.example.com:7033", + "name": "orderer3.group1", + "orgMspName": "OrdererMSP", + "orgName": "Orderer", + "port": 7033, + }, + ], + "profileName": "Group1Genesis", + }, + ], + "peers": [], + "peersCount": 0, + "tools": {}, + }, + { + "anchorPeers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "bootstrapPeers": ""peer0.org1.example.com:7041 peer1.org1.example.com:7042"", + "ca": { + "address": "ca.org1.example.com", + "caAdminNameVar": "ORG1_CA_ADMIN_NAME", + "caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD", + "db": "sqlite", + "exposePort": 7040, + "fullAddress": "ca.org1.example.com:7054", + "port": 7054, + "prefix": "ca", + }, + "cli": { + "address": "cli.org1.example.com", + }, + "cryptoConfigFileName": "crypto-config-org1", + "domain": "org1.example.com", + "headPeer": { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + "mspName": "Org1MSP", + "name": "Org1", + "ordererGroups": [], + "peers": [ + { + "address": "peer0.org1.example.com", + "couchDbExposePort": 5100, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer0.org1.example.com:7041", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer0", + "port": 7041, + }, + { + "address": "peer1.org1.example.com", + "couchDbExposePort": 5101, + "db": { + "type": "LevelDb", + }, + "fullAddress": "peer1.org1.example.com:7042", + "gatewayEnabled": true, + "isAnchorPeer": true, + "name": "peer1", + "port": 7042, + }, + ], + "peersCount": 2, + "tools": {}, + }, + ], +} +`; + exports[`extend config samples/invalid-fablo-config.json 1`] = ` { "chaincodes": [ @@ -9025,6 +11158,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9036,6 +11170,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9048,6 +11183,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9061,6 +11197,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9342,6 +11479,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9353,6 +11491,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9365,6 +11504,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9378,6 +11518,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` }, "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9510,6 +11651,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "orderedHeadsDistinct": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9530,6 +11672,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "name": "group1", "ordererHead": { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9541,6 +11684,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9553,6 +11697,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9599,6 +11744,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "ordererHeads": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", @@ -9611,6 +11757,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = ` "orderers": [ { "address": "orderer0.group1.orderer.example.com", + "adminPort": 7053, "consensus": "etcdraft", "domain": "orderer.example.com", "fullAddress": "orderer0.group1.orderer.example.com:7030", diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap index e86497d7..e13e0915 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap @@ -1543,9 +1543,12 @@ FABRIC_CA_VERSION=1.5.5 FABRIC_CA_POSTGRES_VERSION=14 FABRIC_CCENV_VERSION=2.3.3 FABRIC_BASEOS_VERSION=2.3.3 -FABRIC_JAVAENV_VERSION=2.3 -FABRIC_NODEENV_VERSION=2.3 -RECOMMENDED_NODE_VERSION=12 + + +FABRIC_JAVAENV_VERSION=3.0-beta +FABRIC_NODEENV_VERSION=2.5 +RECOMMENDED_NODE_VERSION=18 + ROOT_CA_ADMIN_NAME=admin ROOT_CA_ADMIN_PASSWORD=adminpw @@ -1715,6 +1718,7 @@ generateChannelsArtifacts() { } installChannels() { + set -x printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" @@ -1815,6 +1819,7 @@ upgradeChaincode() { } notifyOrgsAboutChannels() { + printHeadline "Creating new channel config blocks" "U1F537" createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" @@ -1823,6 +1828,7 @@ notifyOrgsAboutChannels() { printHeadline "Deleting new channel config blocks" "U1F52A" deleteNewChannelUpdateTx "my-channel1" "Org1MSP" "cli.org1.example.com" + } printStartSuccessInfo() { @@ -1927,22 +1933,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7030 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -2069,6 +2076,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -2266,8 +2274,8 @@ createChannelTx() { docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME - docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME + docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME @@ -2281,7 +2289,10 @@ createNewChannelUpdateTx() { local CONFIG_PROFILE=$3 local CONFIG_PATH=$4 local OUTPUT_PATH=$5 - local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + + ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx" + CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx" echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..." inputLog "CHANNEL_NAME: $CHANNEL_NAME" @@ -2304,11 +2315,11 @@ createNewChannelUpdateTx() { docker exec -i $CONTAINER_NAME configtxgen \\ --configPath ./fabric-config \\ -profile "\${CONFIG_PROFILE}" \\ - -outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\ + -outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\ -channelID "\${CHANNEL_NAME}" \\ -asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME - docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME + docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME } @@ -3065,7 +3076,6 @@ createChannelAndJoin() { mkdir "$DIR_NAME" && cd "$DIR_NAME" cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx . - peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx peer channel join -b "\${CHANNEL_NAME}".block diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap index b207f8f5..dfc5ad03 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap @@ -117,6 +117,7 @@ Orderer: &Group1Defaults OrdererType: solo Addresses: - orderer0.group1.orderer.example.com:7030 + BatchTimeout: 2s BatchSize: MaxMessageCount: 10 @@ -1453,9 +1454,12 @@ FABRIC_CA_VERSION=1.5.5 FABRIC_CA_POSTGRES_VERSION=14 FABRIC_CCENV_VERSION=2.5.9 FABRIC_BASEOS_VERSION=2.5.9 -FABRIC_JAVAENV_VERSION=2.5 + + +FABRIC_JAVAENV_VERSION=3.0-beta FABRIC_NODEENV_VERSION=2.5 -RECOMMENDED_NODE_VERSION=16 +RECOMMENDED_NODE_VERSION=18 + ROOT_CA_ADMIN_NAME=admin ROOT_CA_ADMIN_PASSWORD=adminpw @@ -1665,10 +1669,11 @@ generateChannelsArtifacts() { } installChannels() { + set -x printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638" + printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';" } @@ -1770,6 +1775,7 @@ upgradeChaincode() { } notifyOrgsAboutChannels() { + printHeadline "Creating new channel config blocks" "U1F537" createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" @@ -1778,6 +1784,7 @@ notifyOrgsAboutChannels() { printHeadline "Deleting new channel config blocks" "U1F52A" deleteNewChannelUpdateTx "my-channel1" "Org1MSP" "cli.org1.example.com" + } printStartSuccessInfo() { @@ -1881,11 +1888,14 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7030 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -1959,6 +1969,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -2002,6 +2013,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -2130,8 +2142,8 @@ createChannelTx() { docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME - docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME + docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME @@ -2145,7 +2157,10 @@ createNewChannelUpdateTx() { local CONFIG_PROFILE=$3 local CONFIG_PATH=$4 local OUTPUT_PATH=$5 - local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + + ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx" + CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx" echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..." inputLog "CHANNEL_NAME: $CHANNEL_NAME" @@ -2168,11 +2183,11 @@ createNewChannelUpdateTx() { docker exec -i $CONTAINER_NAME configtxgen \\ --configPath ./fabric-config \\ -profile "\${CONFIG_PROFILE}" \\ - -outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\ + -outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\ -channelID "\${CHANNEL_NAME}" \\ -asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME - docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME + docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME } @@ -2929,7 +2944,6 @@ createChannelAndJoin() { mkdir "$DIR_NAME" && cd "$DIR_NAME" cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx . - peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx peer channel join -b "\${CHANNEL_NAME}".block diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap index 33bc82dc..9bc47325 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap @@ -168,6 +168,7 @@ Orderer: &Group1Defaults OrdererType: solo Addresses: - orderer0.group1.orderer.example.com:7030 + BatchTimeout: 2s BatchSize: MaxMessageCount: 10 @@ -2114,9 +2115,12 @@ FABRIC_CA_VERSION=1.5.5 FABRIC_CA_POSTGRES_VERSION=14 FABRIC_CCENV_VERSION=2.4.7 FABRIC_BASEOS_VERSION=2.4.7 -FABRIC_JAVAENV_VERSION=2.4 -FABRIC_NODEENV_VERSION=2.4 -RECOMMENDED_NODE_VERSION=16 + + +FABRIC_JAVAENV_VERSION=3.0-beta +FABRIC_NODEENV_VERSION=2.5 +RECOMMENDED_NODE_VERSION=18 + ROOT_CA_ADMIN_NAME=admin ROOT_CA_ADMIN_PASSWORD=adminpw @@ -2380,12 +2384,13 @@ generateChannelsArtifacts() { } installChannels() { + set -x printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638" + printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638" + printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'orderer0.group1.orderer.example.com:7030';" } @@ -2563,6 +2568,7 @@ upgradeChaincode() { } notifyOrgsAboutChannels() { + printHeadline "Creating new channel config blocks" "U1F537" createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" createNewChannelUpdateTx "my-channel1" "Org2MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" @@ -2574,6 +2580,7 @@ notifyOrgsAboutChannels() { printHeadline "Deleting new channel config blocks" "U1F52A" deleteNewChannelUpdateTx "my-channel1" "Org1MSP" "cli.org1.example.com" deleteNewChannelUpdateTx "my-channel1" "Org2MSP" "cli.org2.example.com" + } printStartSuccessInfo() { @@ -2712,11 +2719,14 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7030 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -2793,6 +2803,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -2836,6 +2847,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -2928,6 +2940,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -3056,8 +3069,8 @@ createChannelTx() { docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME - docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME + docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME @@ -3071,7 +3084,10 @@ createNewChannelUpdateTx() { local CONFIG_PROFILE=$3 local CONFIG_PATH=$4 local OUTPUT_PATH=$5 - local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + + ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx" + CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx" echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..." inputLog "CHANNEL_NAME: $CHANNEL_NAME" @@ -3094,11 +3110,11 @@ createNewChannelUpdateTx() { docker exec -i $CONTAINER_NAME configtxgen \\ --configPath ./fabric-config \\ -profile "\${CONFIG_PROFILE}" \\ - -outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\ + -outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\ -channelID "\${CHANNEL_NAME}" \\ -asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME - docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME + docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME } @@ -3855,7 +3871,6 @@ createChannelAndJoin() { mkdir "$DIR_NAME" && cd "$DIR_NAME" cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx . - peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx peer channel join -b "\${CHANNEL_NAME}".block diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap index 1f2d6803..e203a90a 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap @@ -214,6 +214,7 @@ Orderer: &Group2Defaults OrdererType: solo Addresses: - orderer0.group2.orderer2.com:7050 + BatchTimeout: 2s BatchSize: MaxMessageCount: 1 @@ -3037,9 +3038,12 @@ FABRIC_CA_VERSION=1.5.5 FABRIC_CA_POSTGRES_VERSION=14 FABRIC_CCENV_VERSION=2.4.3 FABRIC_BASEOS_VERSION=2.4.3 -FABRIC_JAVAENV_VERSION=2.4 -FABRIC_NODEENV_VERSION=2.4 -RECOMMENDED_NODE_VERSION=16 + + +FABRIC_JAVAENV_VERSION=3.0-beta +FABRIC_NODEENV_VERSION=2.5 +RECOMMENDED_NODE_VERSION=18 + ROOT_CA_ADMIN_NAME=admin ROOT_CA_ADMIN_PASSWORD=adminpw @@ -3494,24 +3498,25 @@ generateChannelsArtifacts() { } installChannels() { + set -x printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7061' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer1.com-cert.pem' 'orderer0.group1.orderer1.com:7030';" - printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638" + printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org2MSP' 'peer0.org2.example.com:7081' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer1.com-cert.pem' 'orderer0.group1.orderer1.com:7030';" printHeadline "Creating 'my-channel2' on Org1/peer1" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel2' 'Org1MSP' 'peer1.org1.example.com:7062' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer1.com-cert.pem' 'orderer0.group1.orderer1.com:7030';" - printItalics "Joining 'my-channel2' on Org2/peer1" "U1F638" + printItalics "Joining 'my-channel2' on Org2/peer1" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel2' 'Org2MSP' 'peer1.org2.example.com:7082' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer1.com-cert.pem' 'orderer0.group1.orderer1.com:7030';" printHeadline "Creating 'my-channel3' on Org1/peer0" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel3' 'Org1MSP' 'peer0.org1.example.com:7061' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';" - printItalics "Joining 'my-channel3' on Org1/peer1" "U1F638" + printItalics "Joining 'my-channel3' on Org1/peer1" "U1F638" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org1MSP' 'peer1.org1.example.com:7062' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';" - printItalics "Joining 'my-channel3' on Org2/peer0" "U1F638" + printItalics "Joining 'my-channel3' on Org2/peer0" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7081' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';" - printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638" + printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7082' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';" } @@ -3683,6 +3688,7 @@ upgradeChaincode() { } notifyOrgsAboutChannels() { + printHeadline "Creating new channel config blocks" "U1F537" createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" createNewChannelUpdateTx "my-channel1" "Org2MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" @@ -3706,6 +3712,7 @@ notifyOrgsAboutChannels() { deleteNewChannelUpdateTx "my-channel2" "Org2MSP" "cli.org2.example.com" deleteNewChannelUpdateTx "my-channel3" "Org1MSP" "cli.org1.example.com" deleteNewChannelUpdateTx "my-channel3" "Org2MSP" "cli.org2.example.com" + } printStartSuccessInfo() { @@ -3839,22 +3846,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7030 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Orderer1MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer1.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer1.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -3874,22 +3882,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7031 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Orderer1MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.orderer1.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.orderer1.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -3909,22 +3918,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7032 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Orderer1MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer2.group1.orderer1.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer2.group1.orderer1.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4002,22 +4012,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7050 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group2Genesis.block - ORDERER_GENERAL_LOCALMSPID=Orderer2MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group2.orderer2.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group2Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group2.orderer2.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4126,6 +4137,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4174,6 +4186,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4282,6 +4295,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4330,6 +4344,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4463,8 +4478,8 @@ createChannelTx() { docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME - docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME + docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME @@ -4478,7 +4493,10 @@ createNewChannelUpdateTx() { local CONFIG_PROFILE=$3 local CONFIG_PATH=$4 local OUTPUT_PATH=$5 - local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + + ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx" + CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx" echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..." inputLog "CHANNEL_NAME: $CHANNEL_NAME" @@ -4501,11 +4519,11 @@ createNewChannelUpdateTx() { docker exec -i $CONTAINER_NAME configtxgen \\ --configPath ./fabric-config \\ -profile "\${CONFIG_PROFILE}" \\ - -outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\ + -outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\ -channelID "\${CHANNEL_NAME}" \\ -asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME - docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME + docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME } @@ -5262,7 +5280,6 @@ createChannelAndJoin() { mkdir "$DIR_NAME" && cd "$DIR_NAME" cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx . - peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx peer channel join -b "\${CHANNEL_NAME}".block diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap index f6e7b7d2..91fed289 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap @@ -3333,9 +3333,12 @@ FABRIC_CA_VERSION=1.5.5 FABRIC_CA_POSTGRES_VERSION=14 FABRIC_CCENV_VERSION=2.3.2 FABRIC_BASEOS_VERSION=2.3.2 -FABRIC_JAVAENV_VERSION=2.3 -FABRIC_NODEENV_VERSION=2.3 -RECOMMENDED_NODE_VERSION=12 + + +FABRIC_JAVAENV_VERSION=3.0-beta +FABRIC_NODEENV_VERSION=2.5 +RECOMMENDED_NODE_VERSION=18 + ROOT_CA_ADMIN_NAME=admin ROOT_CA_ADMIN_PASSWORD=adminpw @@ -3833,24 +3836,25 @@ generateChannelsArtifacts() { } installChannels() { + set -x printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638" + printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" printHeadline "Creating 'my-channel2' on Org2/peer0" "U1F63B" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel2' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel2' on Org2/peer1" "U1F638" + printItalics "Joining 'my-channel2' on Org2/peer1" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel2' 'Org2MSP' 'peer1.org2.example.com:7062' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" printHeadline "Creating 'my-channel3' on Org1/peer0" "U1F63B" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel3' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel3' on Org1/peer1" "U1F638" + printItalics "Joining 'my-channel3' on Org1/peer1" "U1F638" docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel3' on Org2/peer0" "U1F638" + printItalics "Joining 'my-channel3' on Org2/peer0" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" - printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638" + printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638" docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7062' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';" } @@ -3952,6 +3956,7 @@ upgradeChaincode() { } notifyOrgsAboutChannels() { + printHeadline "Creating new channel config blocks" "U1F537" createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" createNewChannelUpdateTx "my-channel2" "Org2MSP" "MyChannel2" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config" @@ -3969,6 +3974,7 @@ notifyOrgsAboutChannels() { deleteNewChannelUpdateTx "my-channel2" "Org2MSP" "cli.org2.example.com" deleteNewChannelUpdateTx "my-channel3" "Org1MSP" "cli.org1.example.com" deleteNewChannelUpdateTx "my-channel3" "Org2MSP" "cli.org2.example.com" + } printStartSuccessInfo() { @@ -4089,22 +4095,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7030 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4124,22 +4131,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7031 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.orderer.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.orderer.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4221,22 +4229,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7050 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Org1MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.org1.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.org1.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4256,22 +4265,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7051 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Org1MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.org1.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.org1.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4300,6 +4310,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4346,6 +4357,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4446,22 +4458,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7070 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Org2MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.org2.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.org2.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4481,22 +4494,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7071 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Org2MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.org2.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.org2.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4525,6 +4539,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4571,6 +4586,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4671,22 +4687,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7090 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Org3MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.org3.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.org3.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4706,22 +4723,23 @@ services: - FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL} - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENPORT=7091 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block - ORDERER_GENERAL_LOCALMSPID=Org3MSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - GODEBUG=netdns=go - # metrics - - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.org3.example.com:9440 - - ORDERER_METRICS_PROVIDER=prometheus - # enabled TLS + # TLS Configuration - ORDERER_GENERAL_TLS_ENABLED=true - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Cluster TLS Configuration - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + # Genesis file configuration (for solo and raft) + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block + # Metrics configuration + - ORDERER_OPERATIONS_LISTENADDRESS=orderer1.group1.org3.example.com:9443 + - ORDERER_METRICS_PROVIDER=prometheus working_dir: /var/hyperledger/orderer command: orderer ports: @@ -4750,6 +4768,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4796,6 +4815,7 @@ services: - CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION} - CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION} - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION} + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION} # - CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL} - CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL} @@ -4970,8 +4990,8 @@ createChannelTx() { docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME - docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME + docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME @@ -4985,7 +5005,10 @@ createNewChannelUpdateTx() { local CONFIG_PROFILE=$3 local CONFIG_PATH=$4 local OUTPUT_PATH=$5 - local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + + ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx" + OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx" + CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx" echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..." inputLog "CHANNEL_NAME: $CHANNEL_NAME" @@ -5008,11 +5031,11 @@ createNewChannelUpdateTx() { docker exec -i $CONTAINER_NAME configtxgen \\ --configPath ./fabric-config \\ -profile "\${CONFIG_PROFILE}" \\ - -outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\ + -outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\ -channelID "\${CHANNEL_NAME}" \\ -asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME - docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME + docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME removeContainer $CONTAINER_NAME } @@ -5769,7 +5792,6 @@ createChannelAndJoin() { mkdir "$DIR_NAME" && cd "$DIR_NAME" cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx . - peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx peer channel join -b "\${CHANNEL_NAME}".block diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap index 10cdeed9..eea3f4ea 100644 --- a/e2e/__snapshots__/fabloCommands.test.ts.snap +++ b/e2e/__snapshots__/fabloCommands.test.ts.snap @@ -4,6 +4,7 @@ exports[`extend config should extend custom config 1`] = ` "Validation errors count: 0 Validation warnings count: 0 =========================================================== +Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available { "global": { "fabricVersion": "2.4.3", @@ -49,6 +50,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -59,6 +61,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7031, "fullAddress": "orderer1.group1.orderer1.com:7031" }, @@ -69,6 +72,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7032, "fullAddress": "orderer2.group1.orderer1.com:7032" } @@ -81,6 +85,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -92,6 +97,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -113,6 +119,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -125,6 +132,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -136,6 +144,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -149,6 +158,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -159,6 +169,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -204,6 +215,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -214,6 +226,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7031, "fullAddress": "orderer1.group1.orderer1.com:7031" }, @@ -224,6 +237,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7032, "fullAddress": "orderer2.group1.orderer1.com:7032" } @@ -236,6 +250,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -284,6 +299,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -296,6 +312,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -686,6 +703,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -696,6 +714,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7031, "fullAddress": "orderer1.group1.orderer1.com:7031" }, @@ -706,6 +725,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7032, "fullAddress": "orderer2.group1.orderer1.com:7032" } @@ -718,6 +738,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -729,6 +750,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -740,6 +762,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -1025,6 +1048,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -1035,6 +1059,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7031, "fullAddress": "orderer1.group1.orderer1.com:7031" }, @@ -1045,6 +1070,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7032, "fullAddress": "orderer2.group1.orderer1.com:7032" } @@ -1057,6 +1083,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -1068,6 +1095,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -1079,6 +1107,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -1388,6 +1417,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -1400,6 +1430,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -1411,6 +1442,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" } @@ -1422,6 +1454,7 @@ Validation warnings count: 0 "orgMspName": "Orderer2MSP", "domain": "orderer2.com", "consensus": "solo", + "adminPort": 7053, "port": 7050, "fullAddress": "orderer0.group2.orderer2.com:7050" }, @@ -1726,6 +1759,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -1736,6 +1770,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7031, "fullAddress": "orderer1.group1.orderer1.com:7031" }, @@ -1746,6 +1781,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7032, "fullAddress": "orderer2.group1.orderer1.com:7032" } @@ -1758,6 +1794,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -1769,6 +1806,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -1780,6 +1818,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -2166,6 +2205,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -2176,6 +2216,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7031, "fullAddress": "orderer1.group1.orderer1.com:7031" }, @@ -2186,6 +2227,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7032, "fullAddress": "orderer2.group1.orderer1.com:7032" } @@ -2198,6 +2240,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -2209,6 +2252,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" } @@ -2220,6 +2264,7 @@ Validation warnings count: 0 "orgMspName": "Orderer1MSP", "domain": "orderer1.com", "consensus": "etcdraft", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer1.com:7030" }, @@ -2426,6 +2471,7 @@ exports[`extend config should extend default config 1`] = ` "Validation errors count: 0 Validation warnings count: 0 =========================================================== +Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available { "global": { "fabricVersion": "2.5.9", @@ -2472,6 +2518,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2484,6 +2531,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2495,6 +2543,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2508,6 +2557,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2553,6 +2603,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2565,6 +2616,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2771,6 +2823,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2783,6 +2836,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2794,6 +2848,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" } @@ -2805,6 +2860,7 @@ Validation warnings count: 0 "orgMspName": "OrdererMSP", "domain": "orderer.example.com", "consensus": "solo", + "adminPort": 7053, "port": 7030, "fullAddress": "orderer0.group1.orderer.example.com:7030" }, diff --git a/e2e/__snapshots__/schema.test.ts.snap b/e2e/__snapshots__/schema.test.ts.snap index 6923640c..1613693a 100644 --- a/e2e/__snapshots__/schema.test.ts.snap +++ b/e2e/__snapshots__/schema.test.ts.snap @@ -420,6 +420,7 @@ exports[`schema should match snapshot 1`] = ` "enum": [ "solo", "raft", + "BFT", ], "title": "Orderer type", "type": "string", diff --git a/samples/invalid-fablo-config.json b/samples/invalid-fablo-config.json new file mode 100644 index 00000000..32abdd3b --- /dev/null +++ b/samples/invalid-fablo-config.json @@ -0,0 +1,67 @@ +{ + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json", + "global": { + "fabricVersion": "2.3.3", + "tls": true, + "tools": { + "explorer": true + } + }, + "orgs": [ + { + "organization": { + "name": "some-org1", + "domain": "orderer.example.com", + "mspName": "some-org1" + }, + "orderers": [ + { + "groupName": "group1", + "type": "raft", + "instances": 1 + } + ] + }, + { + "organization": { + "name": "Org1", + "domain": "org1.example.com" + }, + "ca": { + "db": "postgres" + }, + "peer": { + "instances": 1, + "db": "CouchDb" + }, + "tools": { + "fabloRest": true + } + } + ], + "channels": [ + { + "name": "my-channel1", + "orgs": [ + { + "name": "Org1", + "peers": [ + "peer0" + ] + } + ] + } + ], + "chaincodes": [ + { + "name": "chaincode1", + "version": "0.0.1", + "lang": "node", + "channel": "my-channel1", + "directory": "./chaincodes/chaincode-kv-node" + } + ], + "hooks": { + "postGenerate": "perl -i -pe 's/MaxMessageCount: 10/MaxMessageCount: 1/g' \"./fablo-target/fabric-config/configtx.yaml\"" + } +} \ No newline at end of file