Skip to content

Support Orderer group for fabric v3 #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
OsamaRab3 wants to merge 3 commits into from
Closed

Support Orderer group for fabric v3 #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ace7ca
inital fix
OsamaRab3 Sep 19, 2025
c314045
update config to fabric v3
OsamaRab3 Sep 19, 2025
6cd8aea
Merge branch 'main' into fix-560
OsamaRab3 Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e2e-network/docker/test-02-v2-raft-2orgs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ waitForContainer "orderer1.group1.orderer1.com" "Starting Raft node channel=my-c
waitForContainer "orderer2.group1.orderer1.com" "Starting Raft node channel=my-channel1"
waitForContainer "orderer2.group1.orderer1.com" "Starting Raft node channel=my-channel2"

waitForContainer "orderer0.group2.orderer2.com" "Created and started new channel my-channel3"
# waitForContainer "orderer0.group2.orderer2.com" "Created and started new channel my-channel3" 180

# check if org1 is ready
waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
Expand Down Expand Up @@ -124,7 +124,7 @@ expectInvokeCli "peer1.org2.example.com" "my-channel2" "chaincode2" \
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" stop && "$FABLO_HOME/fablo.sh" start)
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
waitForChaincode "peer0.org2.example.com" "my-channel1" "chaincode1" "0.0.1"
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
# waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"

# upgrade chaincode
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" chaincode upgrade "chaincode1" "0.0.2")
Expand Down
44 changes: 22 additions & 22 deletions e2e/__snapshots__/extendConfig.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4244,7 +4244,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"directory": "./chaincodes/chaincode-kv-node",
"endorsement": "OR ('Org1MSP.member', 'Org2MSP.member')",
"image": undefined,
"initRequired": false,
"init": "{"Args":[]}",
"instantiatingOrg": {
"anchorPeers": [
{
Expand Down Expand Up @@ -4693,7 +4693,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"directory": "./chaincodes/chaincode-java-simple",
"endorsement": "OR ('Org1MSP.member', 'Org2MSP.member')",
"image": undefined,
"initRequired": false,
"init": "{"Args":[]}",
"instantiatingOrg": {
"anchorPeers": [
{
Expand Down Expand Up @@ -5593,7 +5593,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"name": "my-channel3",
"ordererGroup": {
"configtxOrdererDefaults": "Group2Defaults",
"consensus": "solo",
"consensus": "etcdraft",
"genesisBlockName": "Group2Genesis.block",
"hostingOrgs": [
"Orderer2",
Expand All @@ -5602,7 +5602,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"ordererHead": {
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand All @@ -5614,7 +5614,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
{
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand All @@ -5627,7 +5627,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
{
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand All @@ -5641,7 +5641,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"ordererHead": {
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand Down Expand Up @@ -5848,20 +5848,20 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"global": {
"capabilities": {
"application": "V2_5",
"channel": "V2_0",
"isV2": true,
"isV3": false,
"channel": "V3_0",
"isV2": false,
"isV3": true,
"orderer": "V2_0",
},
"engine": "docker",
"fabricBaseosVersion": "2.5.12",
"fabricBaseosVersion": "3.0.0",
"fabricCaVersion": "1.5.5",
"fabricCcenvVersion": "2.5.12",
"fabricCcenvVersion": "3.0.0",
"fabricJavaenvVersion": "2.5",
"fabricNodeenvVersion": "2.5",
"fabricRecommendedNodeVersion": "16",
"fabricToolsVersion": "2.5.12",
"fabricVersion": "2.5.12",
"fabricToolsVersion": "3.0.0",
"fabricVersion": "3.0.0",
"monitoring": {
"loglevel": "debug",
},
Expand Down Expand Up @@ -5895,7 +5895,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
{
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand Down Expand Up @@ -5976,7 +5976,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
},
{
"configtxOrdererDefaults": "Group2Defaults",
"consensus": "solo",
"consensus": "etcdraft",
"genesisBlockName": "Group2Genesis.block",
"hostingOrgs": [
"Orderer2",
Expand All @@ -5985,7 +5985,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"ordererHead": {
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand All @@ -5997,7 +5997,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
{
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand All @@ -6010,7 +6010,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
{
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand Down Expand Up @@ -6132,7 +6132,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
"ordererGroups": [
{
"configtxOrdererDefaults": "Group2Defaults",
"consensus": "solo",
"consensus": "etcdraft",
"genesisBlockName": "Group2Genesis.block",
"hostingOrgs": [
"Orderer2",
Expand All @@ -6142,7 +6142,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
{
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand All @@ -6155,7 +6155,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
{
"address": "orderer0.group2.orderer2.com",
"adminPort": 7053,
"consensus": "solo",
"consensus": "etcdraft",
"domain": "orderer2.com",
"fullAddress": "orderer0.group2.orderer2.com:7050",
"name": "orderer0.group2",
Expand Down
7 changes: 5 additions & 2 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-ccaas.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,11 +1723,14 @@ generateChannelsArtifacts() {
}

installChannels() {

printHeadline "Creating 'my-channel1' on orderer group 'group1'" "U1F63B"
docker exec -i cli.orderer.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'OrdererMSP' 'orderer0.group1.orderer.example.com:7053' 'crypto/users/Admin@orderer.example.com/tls/client.crt' 'crypto/users/Admin@orderer.example.com/tls/client.key' 'crypto-orderer/tlsca.orderer.example.com-cert.pem';"

sleep 4 # Wait for Raft cluster to establish consensus
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls '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';"

printHeadline "Joining 'my-channel1' on Org1/peer0" "U1F63B"
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls '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';"
}

installChaincodes() {
Expand Down
Loading
Loading