Skip to content
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

Jump to bottom

Update Fabric version in the initial configuration #470

Merged
merged 3 commits into from
Aug 12, 2024
Merged

Update Fabric version in the initial configuration #470

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
a595ca6
updated the fabric version in the configuration
Sanket-0510 Aug 9, 2024
b568f93
updated snapshots
Sanket-0510 Aug 9, 2024
81a453e
Merge branch 'main' into fab-v2-5
dzikowski Aug 12, 2024
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
12 changes: 6 additions & 6 deletions e2e/__snapshots__/extendConfig.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,19 +573,19 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
],
"global": {
"capabilities": {
"application": "V2_0",
"application": "V2_5",
"channel": "V2_0",
"isV2": true,
"orderer": "V2_0",
},
"engine": "docker",
"fabricBaseosVersion": "2.4.7",
"fabricBaseosVersion": "2.5.9",
"fabricCaVersion": "1.5.5",
"fabricCcenvVersion": "2.4.7",
"fabricJavaenvVersion": "2.4",
"fabricNodeenvVersion": "2.4",
"fabricCcenvVersion": "2.5.9",
"fabricJavaenvVersion": "2.5",
"fabricNodeenvVersion": "2.5",
"fabricRecommendedNodeVersion": "16",
"fabricVersion": "2.4.7",
"fabricVersion": "2.5.9",
"monitoring": {
"loglevel": "info",
},
Expand Down
12 changes: 6 additions & 6 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Capabilities:
Orderer: &OrdererCapabilities
V2_0: true
Application: &ApplicationCapabilities
V2_0: true
V2_5: true

################################################################################
# CHANNEL Defaults
Expand Down Expand Up @@ -1448,13 +1448,13 @@ CHAINCODES_BASE_DIR=<absolute path>
COMPOSE_PROJECT_NAME=<name with timestamp>
LOGGING_LEVEL=info

FABRIC_VERSION=2.4.7
FABRIC_VERSION=2.5.9
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
FABRIC_CCENV_VERSION=2.5.9
FABRIC_BASEOS_VERSION=2.5.9
FABRIC_JAVAENV_VERSION=2.5
FABRIC_NODEENV_VERSION=2.5
RECOMMENDED_NODE_VERSION=16

ROOT_CA_ADMIN_NAME=admin
Expand Down
18 changes: 9 additions & 9 deletions e2e/__snapshots__/fabloCommands.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2427,15 +2427,15 @@ Validation warnings count: 0
===========================================================
{
"global": {
"fabricVersion": "2.4.7",
"fabricVersion": "2.5.9",
"tls": false,
"engine": "docker",
"peerDevMode": false,
"fabricCaVersion": "1.5.5",
"fabricCcenvVersion": "2.4.7",
"fabricBaseosVersion": "2.4.7",
"fabricJavaenvVersion": "2.4",
"fabricNodeenvVersion": "2.4",
"fabricCcenvVersion": "2.5.9",
"fabricBaseosVersion": "2.5.9",
"fabricJavaenvVersion": "2.5",
"fabricNodeenvVersion": "2.5",
"fabricRecommendedNodeVersion": "16",
"paths": {
"fabloConfig": "<absolute path>",
Expand All @@ -2447,7 +2447,7 @@ Validation warnings count: 0
"capabilities": {
"channel": "V2_0",
"orderer": "V2_0",
"application": "V2_0",
"application": "V2_5",
"isV2": true
},
"tools": {}
Expand Down Expand Up @@ -2909,7 +2909,7 @@ exports[`init should init simple fablo config 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"fabricVersion": "2.4.7",
"fabricVersion": "2.5.9",
"tls": false,
"engine": "docker",
"peerDevMode": false
Expand Down Expand Up @@ -2963,7 +2963,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"fabricVersion": "2.4.7",
"fabricVersion": "2.5.9",
"tls": false,
"engine": "docker",
"peerDevMode": false
Expand Down Expand Up @@ -3025,7 +3025,7 @@ exports[`init should init simple fablo config with node chaincode and rest api 1
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"fabricVersion": "2.4.7",
"fabricVersion": "2.5.9",
"tls": false,
"engine": "docker",
"peerDevMode": false
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"fabricVersion": "2.4.7",
"fabricVersion": "2.5.9",
"tls": false
},
"orgs": [
Expand Down
2 changes: 1 addition & 1 deletion src/extend-config/extendGlobal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import defaults from "./defaults";
const getNetworkCapabilities = (fabricVersion: string): Capabilities => {

if (version(fabricVersion).isGreaterOrEqual("2.5.0"))
return { channel: "V2_5", orderer: "V2_5", application: "V2_5", isV2: true };
return { channel: "V2_0", orderer: "V2_0", application: "V2_5", isV2: true };

return { channel: "V2_0", orderer: "V2_0", application: "V2_0", isV2: true };
};
Expand Down
4 changes: 2 additions & 2 deletions src/types/FabloConfigExtended.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ interface CapabilitiesV2 {

interface CapabilitiesV_2_5 {
application: "V2_5";
channel: "V2_5";
orderer: "V2_5";
channel: "V2_0";
orderer: "V2_0";
isV2: true;
}

Expand Down
Loading