Skip to content

Commit 96466c8

Browse files
sandeepnRESsandeepnRES
authored
Merge pull request #166 from sanvenDev/main
Upgrade Corda to 4.8
2 parents 5d5bf2a + f0f5555 commit 96466c8

File tree

47 files changed

+376
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+376
-223
lines changed

‎.github/workflows/go.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ on:
77
branches: [ main ]
88

99
jobs:
10-
# test_interopcc_github:
11-
# runs-on: ubuntu-latest
12-
# steps:
13-
# - uses: actions/checkout@v2
14-
#
15-
# - name: Set up Go
16-
# uses: actions/setup-go@v2
17-
# with:
18-
# go-version: 1.16
19-
#
20-
# - name: Build
21-
# run: go build -v ./...
22-
# working-directory: core/network/fabric-interop-cc/contracts/interop
23-
#
24-
# - name: Test
25-
# run: go test -v ./...
26-
# working-directory: core/network/fabric-interop-cc/contracts/interop
10+
test_interopcc_github:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
15+
- name: Set up Go
16+
uses: actions/setup-go@v2
17+
with:
18+
go-version: 1.16
19+
20+
- name: Build
21+
run: go build -v ./...
22+
working-directory: core/network/fabric-interop-cc/contracts/interop
23+
24+
- name: Test
25+
run: go test -v ./...
26+
working-directory: core/network/fabric-interop-cc/contracts/interop
2727

2828
test_interopcc_local:
2929
runs-on: ubuntu-latest
@@ -89,23 +89,23 @@ jobs:
8989
run: make test
9090
working-directory: samples/fabric/simplestate
9191

92-
# test_simpleasset_github:
93-
# runs-on: ubuntu-latest
94-
# steps:
95-
# - uses: actions/checkout@v2
96-
#
97-
# - name: Set up Go
98-
# uses: actions/setup-go@v2
99-
# with:
100-
# go-version: 1.16
101-
#
102-
# - name: Build
103-
# run: go build -v ./...
104-
# working-directory: samples/fabric/simpleasset
105-
#
106-
# - name: Test
107-
# run: go test -v ./...
108-
# working-directory: samples/fabric/simpleasset
92+
test_simpleasset_github:
93+
runs-on: ubuntu-latest
94+
steps:
95+
- uses: actions/checkout@v2
96+
97+
- name: Set up Go
98+
uses: actions/setup-go@v2
99+
with:
100+
go-version: 1.16
101+
102+
- name: Build
103+
run: go build -v ./...
104+
working-directory: samples/fabric/simpleasset
105+
106+
- name: Test
107+
run: go test -v ./...
108+
working-directory: samples/fabric/simpleasset
109109

110110
test_simpleasset_local:
111111
runs-on: ubuntu-latest
@@ -136,23 +136,23 @@ jobs:
136136
run: go test -v ./...
137137
working-directory: samples/fabric/simpleasset
138138

139-
# test_simpleassetandinterop_github:
140-
# runs-on: ubuntu-latest
141-
# steps:
142-
# - uses: actions/checkout@v2
143-
#
144-
# - name: Set up Go
145-
# uses: actions/setup-go@v2
146-
# with:
147-
# go-version: 1.16
148-
#
149-
# - name: Build
150-
# run: go build -v ./...
151-
# working-directory: samples/fabric/simpleassetandinterop
152-
#
153-
# - name: Test
154-
# run: go test -v ./...
155-
# working-directory: samples/fabric/simpleassetandinterop
139+
test_simpleassetandinterop_github:
140+
runs-on: ubuntu-latest
141+
steps:
142+
- uses: actions/checkout@v2
143+
144+
- name: Set up Go
145+
uses: actions/setup-go@v2
146+
with:
147+
go-version: 1.16
148+
149+
- name: Build
150+
run: go build -v ./...
151+
working-directory: samples/fabric/simpleassetandinterop
152+
153+
- name: Test
154+
run: go test -v ./...
155+
working-directory: samples/fabric/simpleassetandinterop
156156

157157
test_simpleassetandinterop_local:
158158
runs-on: ubuntu-latest

‎common/protos-java-kt/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name=Interop Protos
22
group=com.weaver
3-
version=1.2.3
4-
kotlin.incremental=false
3+
version=1.2.4-alpha.1
4+
kotlin.incremental=false

‎core/drivers/corda-driver/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ buildscript {
66
ext.grpc_kotlin_version = "0.1.3" // CURRENT_GRPC_KOTLIN_VERSION
77
ext.corda_release_group = "net.corda"
88
ext.corda_core_release_group = "net.corda"
9-
ext.corda_version = "4.4"
10-
ext.corda_core_version = "4.4"
9+
ext.corda_version = "4.8"
10+
ext.corda_core_version = "4.8"
1111
ext.arrow_version = "0.10.4"
12-
ext.weaver_version = "1.2.3"
12+
ext.weaver_version = "1.2.4-alpha.1"
1313

1414
repositories {
1515
mavenCentral()

‎core/drivers/corda-driver/makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DOCKER_IMAGE_NAME ?= weaver-corda-driver
2-
DOCKER_TAG ?= 1.2.3
2+
DOCKER_TAG ?= 1.2.4-alpha.1
33
DOCKER_REGISTRY ?= ghcr.io/hyperledger-labs
44
GIT_URL = https://github.com/hyperledger-labs/weaver-dlt-interoperability/core/drivers/corda-driver
55
COMPOSE_ARG ?=

‎core/network/corda-interop-app/constants.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
cordaReleaseGroup=net.corda
22
cordaCoreReleaseGroup=net.corda
3-
cordaVersion=4.4
4-
cordaCoreVersion=4.4
5-
gradlePluginsVersion=5.0.4
3+
cordaVersion=4.8
4+
cordaCoreVersion=4.8
5+
gradlePluginsVersion=5.0.12
66
kotlinVersion=1.3.72
77
junitVersion=4.12
88
log4jVersion =2.11.2
9-
platformVersion=5
9+
platformVersion=10
1010
slf4jVersion=1.7.25
1111
nettyVersion=4.1.22.Final
1212
arrowVersion=0.10.4
13-
weaverVersion=1.2.3
13+
weaverVersion=1.2.4-alpha.+

‎core/network/corda-interop-app/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name=Interoperability CorDapp
22
group=com.weaver.corda.app.interop
3-
version=1.2.3
4-
kotlin.incremental=false
3+
version=1.2.4-alpha.1
4+
kotlin.incremental=false

‎core/network/fabric-interop-cc/contracts/interop/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/golang/protobuf v1.5.2
77
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3
88
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.2.3
9-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20210824211358-a73887e0a527
10-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210824193215-dabfe11fd0d1
9+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20210920170720-5d5bf2a54081
10+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210920170720-5d5bf2a54081
1111
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9
1212
github.com/hyperledger/fabric-contract-api-go v1.1.1
1313
github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871

‎core/network/fabric-interop-cc/contracts/interop/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3
7979
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.3/go.mod h1:POCGO/RK9YDfgdhuyqjoD9tRNtWfK7Rh5AYYmsb1Chc=
8080
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.2.3 h1:1pHG9IoUzMedS3mNJPPpzNVqeD7e7FGqhLGbxefPWcU=
8181
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.2.3/go.mod h1:+EM9VNhMfVbspMYwQawE9UHrU0j3OOLERcVBP+DkB1w=
82-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20210824211358-a73887e0a527 h1:Fuu996qWhgvS+E3ikNVHseN+dRiwsAVu218gbPA3cIE=
83-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20210824211358-a73887e0a527/go.mod h1:Nke1cGAeCHSgK8x/+tjzojTAT5L/V6e7ERxPUSbnA/8=
84-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210824193215-dabfe11fd0d1 h1:Ciw4yzEkpgTlAJlBkM8PCqRthy0BMpBJDLEyplkpLEE=
85-
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210824193215-dabfe11fd0d1/go.mod h1:WKKjvakP/ka2PKQATfOE7rFVSLuCwL5rtXYlpEI1rQ4=
82+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20210920170720-5d5bf2a54081 h1:awla67KsROgWu07rPRpa0SGbhOnw5eNfG2mfd4wIDN4=
83+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20210920170720-5d5bf2a54081/go.mod h1:Nke1cGAeCHSgK8x/+tjzojTAT5L/V6e7ERxPUSbnA/8=
84+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210920170720-5d5bf2a54081 h1:RULYba+7qR2tPCXn2URRJyVFcWWq/ef6D1c2JRYioD4=
85+
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v0.0.0-20210920170720-5d5bf2a54081/go.mod h1:WKKjvakP/ka2PKQATfOE7rFVSLuCwL5rtXYlpEI1rQ4=
8686
github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc=
8787
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9 h1:1cAZHHrBYFrX3bwQGhOZtOB4sCM9QWVppd81O8vsPXs=
8888
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc=

‎docs/docs/external/getting-started/test-network/setup-local-docker.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ cd -
325325
To bring down the corda driver, run:
326326
```bash
327327
cd core/drivers/corda-driver
328-
make stop
328+
make stop COMPOSE_ARG='--env-file docker-testnet-envs/.env.corda'
329329
cd -
330330
```
331331

‎docs/docs/external/getting-started/test-network/setup-packages-docker.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ cd -
202202
To bring down the corda driver, run:
203203
```bash
204204
cd core/drivers/corda-driver
205-
make stop '--env-file docker-testnet-envs/.env.corda'
205+
make stop COMPOSE_ARG='--env-file docker-testnet-envs/.env.corda'
206206
cd -
207207
```
208208

0 commit comments

Comments
 (0)