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.

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

Use fabric-gateway v1.4 #1098

Merged
merged 1 commit into from
Oct 25, 2023
Merged
Changes from all commits
Commits
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
Use fabric-gateway v1.4
Also update some GitHub Actions versions.

Signed-off-by: Mark S. Lewis <[email protected]>
  • Loading branch information
bestbeforetoday committed Oct 23, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit eef9ca4302530044cbe742070060d701f39ad216
2 changes: 1 addition & 1 deletion .github/actions/fsat-setup/action.yaml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ inputs:
runs:
using: "composite"
steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: 'npm'
6 changes: 3 additions & 3 deletions .github/actions/test-network-setup/action.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ description: Set up the Test Network Runtime
inputs:
go-version:
description: Version of go
default: 1.20.7
default: '1.20'
node-version:
description: Version of node
default: 18.x
@@ -20,13 +20,13 @@ inputs:
runs:
using: "composite"
steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ inputs.go-version }}
cache: true
cache-dependency-path: '**/go.sum'

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: 'npm'
18 changes: 9 additions & 9 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -16,43 +16,43 @@ concurrency:
cancel-in-progress: true

env:
GO_VER: 1.20.7
GO_VER: '1.20'
NODE_VER: 18.x
JAVA_VER: 11.x

jobs:
go:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VER }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: go install golang.org/x/tools/cmd/goimports@latest
- run: ci/scripts/lint-go.sh

typescript:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}
- run: ci/scripts/lint-typescript.sh

javascript:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}
- run: ci/scripts/lint-javascript.sh

java:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
@@ -62,5 +62,5 @@ jobs:
shell:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: ci/scripts/lint-shell.sh
4 changes: 2 additions & 2 deletions .github/workflows/rest-sample.yaml
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}
cache: 'npm'
10 changes: 5 additions & 5 deletions .github/workflows/test-fsat.yaml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
ansible:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
uses: ./.github/actions/fsat-setup
- run: just test-ansible
@@ -25,7 +25,7 @@ jobs:
appdev:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
uses: ./.github/actions/fsat-setup
- run: just test-appdev
@@ -34,7 +34,7 @@ jobs:
chaincode:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
uses: ./.github/actions/fsat-setup
- run: just test-chaincode
@@ -43,7 +43,7 @@ jobs:
cloud:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
uses: ./.github/actions/fsat-setup
- run: just test-cloud
@@ -52,7 +52,7 @@ jobs:
console:
runs-on: fabric-ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
uses: ./.github/actions/fsat-setup
- run: just test-console
2 changes: 1 addition & 1 deletion .github/workflows/test-network-basic.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- java
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
2 changes: 1 addition & 1 deletion .github/workflows/test-network-events.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- events
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
2 changes: 1 addition & 1 deletion .github/workflows/test-network-gateway.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- java
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
2 changes: 1 addition & 1 deletion .github/workflows/test-network-hsm.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- java
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
8 changes: 4 additions & 4 deletions .github/workflows/test-network-k8s.yaml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
runs-on: fabric-ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Test the network
working-directory: test-network-k8s
run: ../ci/scripts/run-k8s-test-network-basic.sh
@@ -32,7 +32,7 @@ jobs:
runs-on: fabric-ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Test the network
working-directory: test-network-k8s
run: ../ci/scripts/run-k8s-test-network-basic.sh
@@ -44,7 +44,7 @@ jobs:
runs-on: fabric-ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Test the network
working-directory: test-network-k8s
run: ../ci/scripts/run-k8s-test-network-basic.sh
@@ -57,7 +57,7 @@ jobs:
runs-on: fabric-ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Test the network
working-directory: test-network-k8s
run: ../ci/scripts/run-k8s-test-network-basic.sh
2 changes: 1 addition & 1 deletion .github/workflows/test-network-ledger.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- ledger
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
2 changes: 1 addition & 1 deletion .github/workflows/test-network-off-chain.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- java
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
2 changes: 1 addition & 1 deletion .github/workflows/test-network-private.yaml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
- private
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
2 changes: 1 addition & 1 deletion .github/workflows/test-network-sbe.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- sbe
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
2 changes: 1 addition & 1 deletion .github/workflows/test-network-secured.yaml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
- secured
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up the test network runtime
uses: ./.github/actions/test-network-setup
21 changes: 11 additions & 10 deletions asset-transfer-basic/application-gateway-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
module assetTransfer

go 1.18
go 1.20

require (
github.com/hyperledger/fabric-gateway v1.2.2
github.com/hyperledger/fabric-protos-go-apiv2 v0.2.0
google.golang.org/grpc v1.53.0
github.com/hyperledger/fabric-gateway v1.4.0
github.com/hyperledger/fabric-protos-go-apiv2 v0.2.1
google.golang.org/grpc v1.59.0
)

require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/miekg/pkcs11 v1.1.1 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect
google.golang.org/protobuf v1.28.1 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
40 changes: 21 additions & 19 deletions asset-transfer-basic/application-gateway-go/go.sum
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/hyperledger/fabric-gateway v1.2.2 h1:8Al1U2ciEtkiZ21701qbf9oOfd+4Y0inQUhTx1bDRMM=
github.com/hyperledger/fabric-gateway v1.2.2/go.mod h1:Ziu7mVxlE2MCwmH0S8zK3WylwEMq1fVBgf+M8OJglQc=
github.com/hyperledger/fabric-protos-go-apiv2 v0.2.0 h1:+J5f5uPzlgyfyeQ0nnqmuFYQvARGYG8SnZ8xODXlAsI=
github.com/hyperledger/fabric-protos-go-apiv2 v0.2.0/go.mod h1:smwq1q6eKByqQAp0SYdVvE1MvDoneF373j11XwWajgA=
github.com/hyperledger/fabric-gateway v1.4.0 h1:wwCwujtOWNkRYQ32Uq9PfnJTOwHj5CgSU2mxkAhXzUE=
github.com/hyperledger/fabric-gateway v1.4.0/go.mod h1:VqJ9AL9kEm4UQQ2JhHqG92Btw4tpjKE8N/uhlsQdEA4=
github.com/hyperledger/fabric-protos-go-apiv2 v0.2.1 h1:iuCabkxwT1WZ06uREDjYPrtLsGFX05hwbpERYfmcatM=
github.com/hyperledger/fabric-protos-go-apiv2 v0.2.1/go.mod h1:2pq0ui6ZWA0cC8J+eCErgnMDCS1kPOEYVY+06ZAK0qE=
github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14=
google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo=
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
6 changes: 3 additions & 3 deletions asset-transfer-basic/application-gateway-java/build.gradle
Original file line number Diff line number Diff line change
@@ -19,9 +19,9 @@ repositories {
}

dependencies {
implementation 'org.hyperledger.fabric:fabric-gateway:1.2.2'
compileOnly 'io.grpc:grpc-api:1.54.1'
runtimeOnly 'io.grpc:grpc-netty-shaded:1.54.1'
implementation 'org.hyperledger.fabric:fabric-gateway:1.4.0'
compileOnly 'io.grpc:grpc-api:1.59.0'
runtimeOnly 'io.grpc:grpc-netty-shaded:1.59.0'
implementation 'com.google.code.gson:gson:2.10.1'
}

Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"engines": {
"node": ">=14"
"node": ">=18"
},
"scripts": {
"build": "tsc",
@@ -19,14 +19,15 @@
"author": "Hyperledger",
"license": "Apache-2.0",
"dependencies": {
"@hyperledger/fabric-gateway": "^1.1.1"
"@grpc/grpc-js": "^1.9.7",
"@hyperledger/fabric-gateway": "~1.4.0"
},
"devDependencies": {
"@tsconfig/node14": "^1.0.3",
"@types/node": "^14.18.16",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.14.0",
"typescript": "~4.6.4"
"@tsconfig/node18": "^18.2.2",
"@types/node": "^18.18.6",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"eslint": "^8.52.0",
"typescript": "~5.2.2"
}
}
Loading