From cb3397166525e0203cd5a16fedbbe6a5a7cafa99 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Mon, 23 Oct 2023 18:47:47 +0100 Subject: [PATCH] Use fabric-gateway v1.4 Also update some GitHub Actions versions. Signed-off-by: Mark S. Lewis --- .github/actions/fsat-setup/action.yaml | 2 +- .../actions/test-network-setup/action.yaml | 6 +-- .github/workflows/lint.yaml | 18 ++++----- .github/workflows/rest-sample.yaml | 4 +- .github/workflows/test-fsat.yaml | 10 ++--- .github/workflows/test-network-basic.yaml | 2 +- .github/workflows/test-network-events.yaml | 2 +- .github/workflows/test-network-gateway.yaml | 2 +- .github/workflows/test-network-hsm.yaml | 2 +- .github/workflows/test-network-k8s.yaml | 8 ++-- .github/workflows/test-network-ledger.yaml | 2 +- .github/workflows/test-network-off-chain.yaml | 2 +- .github/workflows/test-network-private.yaml | 2 +- .github/workflows/test-network-sbe.yaml | 2 +- .github/workflows/test-network-secured.yaml | 2 +- .../application-gateway-go/go.mod | 21 +++++----- .../application-gateway-go/go.sum | 40 ++++++++++--------- .../application-gateway-java/build.gradle | 6 +-- .../package.json | 17 ++++---- .../tsconfig.json | 3 +- .../application-java/build.gradle | 4 +- asset-transfer-basic/rest-api-go/go.mod | 21 +++++----- asset-transfer-basic/rest-api-go/go.sum | 40 ++++++++++--------- .../application-gateway-go/go.mod | 21 +++++----- .../application-gateway-go/go.sum | 40 ++++++++++--------- .../application-gateway-java/build.gradle | 6 +-- .../package.json | 17 ++++---- .../application-gateway-typescript/src/app.ts | 2 +- .../tsconfig.json | 3 +- .../application-java/build.gradle | 4 +- .../package.json | 16 ++++---- .../tsconfig.json | 3 +- .../package.json | 16 ++++---- .../tsconfig.json | 3 +- .../applications/conga-cards/package.json | 17 ++++---- .../applications/conga-cards/tsconfig.json | 2 +- .../applications/ping-chaincode/package.json | 17 ++++---- .../applications/ping-chaincode/tsconfig.json | 29 +++++++------- .../applications/rest-api/package.json | 17 ++++---- .../applications/rest-api/tsconfig.json | 13 +++--- .../trader-typescript/package.json | 17 ++++---- .../trader-typescript/src/contract.ts | 2 +- .../application-go/go.mod | 21 +++++----- .../application-go/go.sum | 40 ++++++++++--------- .../application-typescript/package.json | 15 +++---- .../application-typescript/tsconfig.json | 2 +- .../application-java/app/build.gradle | 8 ++-- .../application-typescript/package.json | 18 +++++---- .../application-typescript/tsconfig.json | 2 +- 49 files changed, 294 insertions(+), 275 deletions(-) diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml index 8b0ff661b5..5ff5849fe2 100644 --- a/.github/actions/fsat-setup/action.yaml +++ b/.github/actions/fsat-setup/action.yaml @@ -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' diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index af339aae59..6593195287 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -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' diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c31f3e8cc6..928f8cda98 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true env: - GO_VER: 1.20.7 + GO_VER: '1.20' NODE_VER: 18.x JAVA_VER: 11.x @@ -24,18 +24,18 @@ 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 @@ -43,8 +43,8 @@ jobs: 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 @@ -52,7 +52,7 @@ jobs: 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 diff --git a/.github/workflows/rest-sample.yaml b/.github/workflows/rest-sample.yaml index 9e331c502a..f6417d224a 100644 --- a/.github/workflows/rest-sample.yaml +++ b/.github/workflows/rest-sample.yaml @@ -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' diff --git a/.github/workflows/test-fsat.yaml b/.github/workflows/test-fsat.yaml index 60f6e30574..539ac8f536 100644 --- a/.github/workflows/test-fsat.yaml +++ b/.github/workflows/test-fsat.yaml @@ -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 diff --git a/.github/workflows/test-network-basic.yaml b/.github/workflows/test-network-basic.yaml index 939fa4e121..31cc08c16f 100644 --- a/.github/workflows/test-network-basic.yaml +++ b/.github/workflows/test-network-basic.yaml @@ -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 diff --git a/.github/workflows/test-network-events.yaml b/.github/workflows/test-network-events.yaml index 4cd28fedfd..2d1d36dcc2 100644 --- a/.github/workflows/test-network-events.yaml +++ b/.github/workflows/test-network-events.yaml @@ -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 diff --git a/.github/workflows/test-network-gateway.yaml b/.github/workflows/test-network-gateway.yaml index 6d85c3e9ab..0edd7f5c2b 100644 --- a/.github/workflows/test-network-gateway.yaml +++ b/.github/workflows/test-network-gateway.yaml @@ -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 diff --git a/.github/workflows/test-network-hsm.yaml b/.github/workflows/test-network-hsm.yaml index 806f91420b..9c727a9c07 100644 --- a/.github/workflows/test-network-hsm.yaml +++ b/.github/workflows/test-network-hsm.yaml @@ -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 diff --git a/.github/workflows/test-network-k8s.yaml b/.github/workflows/test-network-k8s.yaml index b6c905c04f..c83e22b411 100644 --- a/.github/workflows/test-network-k8s.yaml +++ b/.github/workflows/test-network-k8s.yaml @@ -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 diff --git a/.github/workflows/test-network-ledger.yaml b/.github/workflows/test-network-ledger.yaml index 28690d752e..cb726c8256 100644 --- a/.github/workflows/test-network-ledger.yaml +++ b/.github/workflows/test-network-ledger.yaml @@ -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 diff --git a/.github/workflows/test-network-off-chain.yaml b/.github/workflows/test-network-off-chain.yaml index 6bf56d11e2..0281b1200b 100644 --- a/.github/workflows/test-network-off-chain.yaml +++ b/.github/workflows/test-network-off-chain.yaml @@ -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 diff --git a/.github/workflows/test-network-private.yaml b/.github/workflows/test-network-private.yaml index 15549688a6..5f9588aab0 100644 --- a/.github/workflows/test-network-private.yaml +++ b/.github/workflows/test-network-private.yaml @@ -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 diff --git a/.github/workflows/test-network-sbe.yaml b/.github/workflows/test-network-sbe.yaml index 1a7f769ee5..3b030b11bb 100644 --- a/.github/workflows/test-network-sbe.yaml +++ b/.github/workflows/test-network-sbe.yaml @@ -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 diff --git a/.github/workflows/test-network-secured.yaml b/.github/workflows/test-network-secured.yaml index 4eafe7a7cf..568f317cc4 100644 --- a/.github/workflows/test-network-secured.yaml +++ b/.github/workflows/test-network-secured.yaml @@ -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 diff --git a/asset-transfer-basic/application-gateway-go/go.mod b/asset-transfer-basic/application-gateway-go/go.mod index f91d1181de..a97701d2d9 100644 --- a/asset-transfer-basic/application-gateway-go/go.mod +++ b/asset-transfer-basic/application-gateway-go/go.mod @@ -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 ) diff --git a/asset-transfer-basic/application-gateway-go/go.sum b/asset-transfer-basic/application-gateway-go/go.sum index 8e88302626..a873e4f66c 100644 --- a/asset-transfer-basic/application-gateway-go/go.sum +++ b/asset-transfer-basic/application-gateway-go/go.sum @@ -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= diff --git a/asset-transfer-basic/application-gateway-java/build.gradle b/asset-transfer-basic/application-gateway-java/build.gradle index 5841fd470c..11bf058308 100644 --- a/asset-transfer-basic/application-gateway-java/build.gradle +++ b/asset-transfer-basic/application-gateway-java/build.gradle @@ -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' } diff --git a/asset-transfer-basic/application-gateway-typescript/package.json b/asset-transfer-basic/application-gateway-typescript/package.json index 8557bc9a71..353a2a9f7c 100644 --- a/asset-transfer-basic/application-gateway-typescript/package.json +++ b/asset-transfer-basic/application-gateway-typescript/package.json @@ -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" } } diff --git a/asset-transfer-basic/application-gateway-typescript/tsconfig.json b/asset-transfer-basic/application-gateway-typescript/tsconfig.json index 2052fb6e98..2a3ffbeb7d 100644 --- a/asset-transfer-basic/application-gateway-typescript/tsconfig.json +++ b/asset-transfer-basic/application-gateway-typescript/tsconfig.json @@ -1,10 +1,9 @@ { - "extends":"@tsconfig/node14/tsconfig.json", + "extends":"@tsconfig/node18/tsconfig.json", "compilerOptions": { "experimentalDecorators": true, "emitDecoratorMetadata": true, "outDir": "dist", - "moduleResolution": "node", "declaration": true, "sourceMap": true, "noImplicitAny": true diff --git a/asset-transfer-basic/application-java/build.gradle b/asset-transfer-basic/application-java/build.gradle index a204249d8b..74b1e3ebc5 100644 --- a/asset-transfer-basic/application-java/build.gradle +++ b/asset-transfer-basic/application-java/build.gradle @@ -24,8 +24,8 @@ repositories { dependencies { // This dependency is used by the application. - implementation 'com.google.guava:guava:29.0-jre' - implementation 'org.hyperledger.fabric:fabric-gateway-java:2.1.1' + implementation 'com.google.guava:guava:30.1.1-jre' + implementation 'org.hyperledger.fabric:fabric-gateway-java:2.2.8' } application { diff --git a/asset-transfer-basic/rest-api-go/go.mod b/asset-transfer-basic/rest-api-go/go.mod index 04946b43a3..f2db224b03 100644 --- a/asset-transfer-basic/rest-api-go/go.mod +++ b/asset-transfer-basic/rest-api-go/go.mod @@ -1,19 +1,20 @@ module rest-api-go -go 1.19 +go 1.20 require ( - github.com/hyperledger/fabric-gateway v1.2.2 - google.golang.org/grpc v1.53.0 + github.com/hyperledger/fabric-gateway v1.4.0 + google.golang.org/grpc v1.59.0 ) require ( - github.com/golang/protobuf v1.5.2 // indirect - github.com/hyperledger/fabric-protos-go-apiv2 v0.2.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/hyperledger/fabric-protos-go-apiv2 v0.2.1 // 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 ) diff --git a/asset-transfer-basic/rest-api-go/go.sum b/asset-transfer-basic/rest-api-go/go.sum index 8e88302626..a873e4f66c 100644 --- a/asset-transfer-basic/rest-api-go/go.sum +++ b/asset-transfer-basic/rest-api-go/go.sum @@ -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= diff --git a/asset-transfer-events/application-gateway-go/go.mod b/asset-transfer-events/application-gateway-go/go.mod index 572f492d7e..0fb2f7f2ee 100644 --- a/asset-transfer-events/application-gateway-go/go.mod +++ b/asset-transfer-events/application-gateway-go/go.mod @@ -1,19 +1,20 @@ module assetTransfer -go 1.18 +go 1.20 require ( - github.com/hyperledger/fabric-gateway v1.2.2 - google.golang.org/grpc v1.53.0 + github.com/hyperledger/fabric-gateway v1.4.0 + google.golang.org/grpc v1.59.0 ) require ( - github.com/golang/protobuf v1.5.2 // indirect - github.com/hyperledger/fabric-protos-go-apiv2 v0.2.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/hyperledger/fabric-protos-go-apiv2 v0.2.1 // 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 ) diff --git a/asset-transfer-events/application-gateway-go/go.sum b/asset-transfer-events/application-gateway-go/go.sum index 8e88302626..a873e4f66c 100644 --- a/asset-transfer-events/application-gateway-go/go.sum +++ b/asset-transfer-events/application-gateway-go/go.sum @@ -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= diff --git a/asset-transfer-events/application-gateway-java/build.gradle b/asset-transfer-events/application-gateway-java/build.gradle index 1ed4b4644c..cbd4278f31 100644 --- a/asset-transfer-events/application-gateway-java/build.gradle +++ b/asset-transfer-events/application-gateway-java/build.gradle @@ -8,9 +8,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.9' implementation 'com.google.code.gson:gson:2.10.1' } diff --git a/asset-transfer-events/application-gateway-typescript/package.json b/asset-transfer-events/application-gateway-typescript/package.json index 5468cbe516..217805e53f 100755 --- a/asset-transfer-events/application-gateway-typescript/package.json +++ b/asset-transfer-events/application-gateway-typescript/package.json @@ -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" } } diff --git a/asset-transfer-events/application-gateway-typescript/src/app.ts b/asset-transfer-events/application-gateway-typescript/src/app.ts index 5b7c281c6d..551e000345 100755 --- a/asset-transfer-events/application-gateway-typescript/src/app.ts +++ b/asset-transfer-events/application-gateway-typescript/src/app.ts @@ -82,7 +82,7 @@ async function readEvents(events: CloseableAsyncIterable): Promi } } catch (error: unknown) { // Ignore the read error when events.close() is called explicitly - if (!(error instanceof GatewayError) || error.code !== grpc.status.CANCELLED) { + if (!(error instanceof GatewayError) || error.code !== grpc.status.CANCELLED.valueOf()) { throw error; } } diff --git a/asset-transfer-events/application-gateway-typescript/tsconfig.json b/asset-transfer-events/application-gateway-typescript/tsconfig.json index 2052fb6e98..2a3ffbeb7d 100755 --- a/asset-transfer-events/application-gateway-typescript/tsconfig.json +++ b/asset-transfer-events/application-gateway-typescript/tsconfig.json @@ -1,10 +1,9 @@ { - "extends":"@tsconfig/node14/tsconfig.json", + "extends":"@tsconfig/node18/tsconfig.json", "compilerOptions": { "experimentalDecorators": true, "emitDecoratorMetadata": true, "outDir": "dist", - "moduleResolution": "node", "declaration": true, "sourceMap": true, "noImplicitAny": true diff --git a/asset-transfer-ledger-queries/application-java/build.gradle b/asset-transfer-ledger-queries/application-java/build.gradle index a204249d8b..74b1e3ebc5 100644 --- a/asset-transfer-ledger-queries/application-java/build.gradle +++ b/asset-transfer-ledger-queries/application-java/build.gradle @@ -24,8 +24,8 @@ repositories { dependencies { // This dependency is used by the application. - implementation 'com.google.guava:guava:29.0-jre' - implementation 'org.hyperledger.fabric:fabric-gateway-java:2.1.1' + implementation 'com.google.guava:guava:30.1.1-jre' + implementation 'org.hyperledger.fabric:fabric-gateway-java:2.2.8' } application { diff --git a/asset-transfer-private-data/application-gateway-typescript/package.json b/asset-transfer-private-data/application-gateway-typescript/package.json index 982ff3ec2c..caad0cae1f 100644 --- a/asset-transfer-private-data/application-gateway-typescript/package.json +++ b/asset-transfer-private-data/application-gateway-typescript/package.json @@ -5,7 +5,7 @@ "main": "dist/index.js", "typings": "dist/index.d.ts", "engines": { - "node": ">=14" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -19,13 +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.1", - "@typescript-eslint/eslint-plugin": "^5.6.0", - "@typescript-eslint/parser": "^5.6.0", - "eslint": "^8.4.1", - "typescript": "~4.5.2" + "@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" } } diff --git a/asset-transfer-private-data/application-gateway-typescript/tsconfig.json b/asset-transfer-private-data/application-gateway-typescript/tsconfig.json index 2052fb6e98..2a3ffbeb7d 100644 --- a/asset-transfer-private-data/application-gateway-typescript/tsconfig.json +++ b/asset-transfer-private-data/application-gateway-typescript/tsconfig.json @@ -1,10 +1,9 @@ { - "extends":"@tsconfig/node14/tsconfig.json", + "extends":"@tsconfig/node18/tsconfig.json", "compilerOptions": { "experimentalDecorators": true, "emitDecoratorMetadata": true, "outDir": "dist", - "moduleResolution": "node", "declaration": true, "sourceMap": true, "noImplicitAny": true diff --git a/asset-transfer-secured-agreement/application-gateway-typescript/package.json b/asset-transfer-secured-agreement/application-gateway-typescript/package.json index e811d92473..0da9d8bcc2 100644 --- a/asset-transfer-secured-agreement/application-gateway-typescript/package.json +++ b/asset-transfer-secured-agreement/application-gateway-typescript/package.json @@ -5,7 +5,7 @@ "main": "dist/index.js", "typings": "dist/index.d.ts", "engines": { - "node": ">=14" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -19,13 +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.1", - "@typescript-eslint/eslint-plugin": "^5.6.0", - "@typescript-eslint/parser": "^5.6.0", - "eslint": "^8.4.1", - "typescript": "~4.5.2" + "@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" } } diff --git a/asset-transfer-secured-agreement/application-gateway-typescript/tsconfig.json b/asset-transfer-secured-agreement/application-gateway-typescript/tsconfig.json index 2052fb6e98..2a3ffbeb7d 100644 --- a/asset-transfer-secured-agreement/application-gateway-typescript/tsconfig.json +++ b/asset-transfer-secured-agreement/application-gateway-typescript/tsconfig.json @@ -1,10 +1,9 @@ { - "extends":"@tsconfig/node14/tsconfig.json", + "extends":"@tsconfig/node18/tsconfig.json", "compilerOptions": { "experimentalDecorators": true, "emitDecoratorMetadata": true, "outDir": "dist", - "moduleResolution": "node", "declaration": true, "sourceMap": true, "noImplicitAny": true diff --git a/full-stack-asset-transfer-guide/applications/conga-cards/package.json b/full-stack-asset-transfer-guide/applications/conga-cards/package.json index e64b3748b8..c4dd469925 100644 --- a/full-stack-asset-transfer-guide/applications/conga-cards/package.json +++ b/full-stack-asset-transfer-guide/applications/conga-cards/package.json @@ -5,7 +5,7 @@ "main": "dist/index.js", "typings": "dist/index.d.ts", "engines": { - "node": ">=16.13.0" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -19,17 +19,18 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "@hyperledger/fabric-gateway": "^1.1.0", + "@grpc/grpc-js": "^1.9.7", + "@hyperledger/fabric-gateway": "~1.4.0", "axios": "^0.27.2", "source-map-support": "^0.5.21" }, "devDependencies": { - "@tsconfig/node16": "^1.0.3", - "@types/node": "^16.11.46", + "@tsconfig/node18": "^18.2.2", + "@types/node": "^18.18.6", "@types/source-map-support": "^0.5.6", - "@typescript-eslint/eslint-plugin": "^5.22.0", - "@typescript-eslint/parser": "^5.22.0", - "eslint": "^8.14.0", - "typescript": "~4.7.4" + "@typescript-eslint/eslint-plugin": "^6.9.0", + "@typescript-eslint/parser": "^6.9.0", + "eslint": "^8.52.0", + "typescript": "~5.2.2" } } diff --git a/full-stack-asset-transfer-guide/applications/conga-cards/tsconfig.json b/full-stack-asset-transfer-guide/applications/conga-cards/tsconfig.json index 9de9d03002..891d7c7406 100644 --- a/full-stack-asset-transfer-guide/applications/conga-cards/tsconfig.json +++ b/full-stack-asset-transfer-guide/applications/conga-cards/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@tsconfig/node16/tsconfig.json", + "extends": "@tsconfig/node18/tsconfig.json", "compilerOptions": { "declaration": true, "declarationMap": true, diff --git a/full-stack-asset-transfer-guide/applications/ping-chaincode/package.json b/full-stack-asset-transfer-guide/applications/ping-chaincode/package.json index 900a7fc654..5630f6bf44 100644 --- a/full-stack-asset-transfer-guide/applications/ping-chaincode/package.json +++ b/full-stack-asset-transfer-guide/applications/ping-chaincode/package.json @@ -4,7 +4,7 @@ "description": "Asset Transfer Basic Application implemented in typeScript using fabric-gateway", "main": "dist/app.js", "engines": { - "node": ">=14" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -18,18 +18,19 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "@hyperledger/fabric-gateway": "^1.1.0", + "@grpc/grpc-js": "^1.9.7", + "@hyperledger/fabric-gateway": "~1.4.0", "dotenv": "^16.0.1", "env-var": "^7.1.1", "js-yaml": "^4.1.0" }, "devDependencies": { - "@tsconfig/node14": "^1.0.3", + "@tsconfig/node18": "^18.2.2", "@types/js-yaml": "^4.0.5", - "@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" + "@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" } } diff --git a/full-stack-asset-transfer-guide/applications/ping-chaincode/tsconfig.json b/full-stack-asset-transfer-guide/applications/ping-chaincode/tsconfig.json index 2052fb6e98..d088f396b8 100644 --- a/full-stack-asset-transfer-guide/applications/ping-chaincode/tsconfig.json +++ b/full-stack-asset-transfer-guide/applications/ping-chaincode/tsconfig.json @@ -1,18 +1,17 @@ { - "extends":"@tsconfig/node14/tsconfig.json", - "compilerOptions": { - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "outDir": "dist", - "moduleResolution": "node", - "declaration": true, - "sourceMap": true, - "noImplicitAny": true - }, - "include": [ - "./src/**/*" - ], - "exclude": [ + "extends":"@tsconfig/node18/tsconfig.json", + "compilerOptions": { + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "outDir": "dist", + "declaration": true, + "sourceMap": true, + "noImplicitAny": true + }, + "include": [ + "./src/**/*" + ], + "exclude": [ "./src/**/*.spec.ts" - ] + ] } diff --git a/full-stack-asset-transfer-guide/applications/rest-api/package.json b/full-stack-asset-transfer-guide/applications/rest-api/package.json index 61ffc7b10b..f540e2d5bf 100644 --- a/full-stack-asset-transfer-guide/applications/rest-api/package.json +++ b/full-stack-asset-transfer-guide/applications/rest-api/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "engines": { - "node": ">=14" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -17,19 +17,20 @@ "author": "", "license": "ISC", "devDependencies": { - "@hyperledger/fabric-gateway": "^1.1.0", - "@tsconfig/node14": "^1.0.3", + "@tsconfig/node18": "^18.2.2", "@types/body-parser": "^1.17.0", "@types/express": "^4.16.0", - "@types/node": "^14.18.16", - "@typescript-eslint/eslint-plugin": "^5.22.0", - "@typescript-eslint/parser": "^5.22.0", - "eslint": "^8.14.0", + "@types/node": "^18.18.6", + "@typescript-eslint/eslint-plugin": "^6.9.0", + "@typescript-eslint/parser": "^6.9.0", + "eslint": "^8.52.0", "nodemon": "^1.18.3", "ts-node": "^7.0.0", - "typescript": "~4.6.4" + "typescript": "~5.2.2" }, "dependencies": { + "@grpc/grpc-js": "^1.9.7", + "@hyperledger/fabric-gateway": "~1.4.0", "body-parser": "^1.18.3", "cors": "^2.8.5", "express": "^4.16.3" diff --git a/full-stack-asset-transfer-guide/applications/rest-api/tsconfig.json b/full-stack-asset-transfer-guide/applications/rest-api/tsconfig.json index f5129dc769..bab355bb49 100644 --- a/full-stack-asset-transfer-guide/applications/rest-api/tsconfig.json +++ b/full-stack-asset-transfer-guide/applications/rest-api/tsconfig.json @@ -1,14 +1,13 @@ { + "extends": "@tsconfig/node18/tsconfig.json", "compilerOptions": { - "target": "es6", //default is es5 - "module": "commonjs",//CommonJs style module in output - "outDir": "dist" , //change the output directory - "resolveJsonModule": true //to import out json database + "outDir": "dist", //change the output directory + "resolveJsonModule": true //to import out json database }, "include": [ - "src/**/*.ts" //which kind of files to compile + "src/**/*.ts" //which kind of files to compile ], "exclude": [ - "node_modules" //which files or directories to ignore + "node_modules" //which files or directories to ignore ] - } \ No newline at end of file +} \ No newline at end of file diff --git a/full-stack-asset-transfer-guide/applications/trader-typescript/package.json b/full-stack-asset-transfer-guide/applications/trader-typescript/package.json index 19b467ccfa..8999c7dd58 100644 --- a/full-stack-asset-transfer-guide/applications/trader-typescript/package.json +++ b/full-stack-asset-transfer-guide/applications/trader-typescript/package.json @@ -5,7 +5,7 @@ "main": "dist/index.js", "typings": "dist/index.d.ts", "engines": { - "node": ">=18.12.0" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -19,14 +19,15 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "@hyperledger/fabric-gateway": "^1.1.0" + "@grpc/grpc-js": "^1.9.7", + "@hyperledger/fabric-gateway": "~1.4.0" }, "devDependencies": { - "@tsconfig/node18": "^2.0.0", - "@types/node": "^18.16.1", - "@typescript-eslint/eslint-plugin": "^5.22.0", - "@typescript-eslint/parser": "^5.22.0", - "eslint": "^8.14.0", - "typescript": "~5.0.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" } } diff --git a/full-stack-asset-transfer-guide/applications/trader-typescript/src/contract.ts b/full-stack-asset-transfer-guide/applications/trader-typescript/src/contract.ts index 2e210c6835..48c64ba18f 100644 --- a/full-stack-asset-transfer-guide/applications/trader-typescript/src/contract.ts +++ b/full-stack-asset-transfer-guide/applications/trader-typescript/src/contract.ts @@ -84,7 +84,7 @@ export class AssetTransfer { } async function submitWithRetry(submit: () => Promise): Promise { - let lastError: unknown | undefined; + let lastError: unknown; for (let retryCount = 0; retryCount < RETRIES; retryCount++) { try { diff --git a/hardware-security-module/application-go/go.mod b/hardware-security-module/application-go/go.mod index 498ee7ad3d..7b14df77ac 100644 --- a/hardware-security-module/application-go/go.mod +++ b/hardware-security-module/application-go/go.mod @@ -1,19 +1,20 @@ module github.com/hyperledger/fabric-samples/hardware-security-module/application-go -go 1.18 +go 1.20 require ( - github.com/hyperledger/fabric-gateway v1.2.2 - google.golang.org/grpc v1.53.0 + github.com/hyperledger/fabric-gateway v1.4.0 + google.golang.org/grpc v1.59.0 ) require ( - github.com/golang/protobuf v1.5.2 // indirect - github.com/hyperledger/fabric-protos-go-apiv2 v0.2.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/hyperledger/fabric-protos-go-apiv2 v0.2.1 // 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 ) diff --git a/hardware-security-module/application-go/go.sum b/hardware-security-module/application-go/go.sum index 8e88302626..a873e4f66c 100644 --- a/hardware-security-module/application-go/go.sum +++ b/hardware-security-module/application-go/go.sum @@ -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= diff --git a/hardware-security-module/application-typescript/package.json b/hardware-security-module/application-typescript/package.json index 3b1a1ee9a7..e57d185303 100644 --- a/hardware-security-module/application-typescript/package.json +++ b/hardware-security-module/application-typescript/package.json @@ -4,7 +4,7 @@ "description": "", "main": "dist/hsm-sample.js", "engines": { - "node": ">=16" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -17,14 +17,15 @@ "author": "", "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/node16": "^16.1.1", - "@types/node": "^16.18.48", - "@typescript-eslint/eslint-plugin": "^6.6.0", - "@typescript-eslint/parser": "^6.6.0", - "eslint": "^8.1.0", + "@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", "npm-run-all": "^4.1.5", "rimraf": "^5.0.1", "typescript": "~5.2.2" diff --git a/hardware-security-module/application-typescript/tsconfig.json b/hardware-security-module/application-typescript/tsconfig.json index d147832153..6773460426 100644 --- a/hardware-security-module/application-typescript/tsconfig.json +++ b/hardware-security-module/application-typescript/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@tsconfig/node16/tsconfig.json", + "extends": "@tsconfig/node18/tsconfig.json", "compilerOptions": { "declaration": true, "declarationMap": true, diff --git a/off_chain_data/application-java/app/build.gradle b/off_chain_data/application-java/app/build.gradle index 8359c7f27a..d0672b42bf 100644 --- a/off_chain_data/application-java/app/build.gradle +++ b/off_chain_data/application-java/app/build.gradle @@ -14,10 +14,10 @@ repositories { } dependencies { - implementation 'org.hyperledger.fabric:fabric-gateway:1.2.2' - implementation 'org.hyperledger.fabric:fabric-protos:0.2.0' - 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' + implementation 'org.hyperledger.fabric:fabric-protos:0.2.1' + 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' } diff --git a/off_chain_data/application-typescript/package.json b/off_chain_data/application-typescript/package.json index 6bc3b6afa9..5aefc1f17f 100644 --- a/off_chain_data/application-typescript/package.json +++ b/off_chain_data/application-typescript/package.json @@ -5,7 +5,7 @@ "main": "dist/index.js", "typings": "dist/index.d.ts", "engines": { - "node": ">=14.17.0" + "node": ">=18" }, "scripts": { "build": "tsc", @@ -18,14 +18,16 @@ "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", + "@hyperledger/fabric-protos": "^0.2.1" }, "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" } } diff --git a/off_chain_data/application-typescript/tsconfig.json b/off_chain_data/application-typescript/tsconfig.json index 9436c6bb84..904acb415b 100644 --- a/off_chain_data/application-typescript/tsconfig.json +++ b/off_chain_data/application-typescript/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@tsconfig/node14/tsconfig.json", + "extends": "@tsconfig/node18/tsconfig.json", "compilerOptions": { "declaration": true, "declarationMap": true,