Skip to content

Commit 8a9a43d

Browse files
LordKubayaRafaelAPB
authored andcommitted
fix(satp-hermes): contract versioning
Signed-off-by: Carlos Amaro <[email protected]>
1 parent 9fb96fa commit 8a9a43d

File tree

14 files changed

+25
-27
lines changed

14 files changed

+25
-27
lines changed

.github/workflows/satp-hermes-gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
run: yarn configure
126126

127127
- name: Generate protobuf files
128-
run: yarn workspace @hyperledger/cactus-plugin-satp-hermes build-proto
128+
run: yarn workspace @hyperledger/cactus-plugin-satp-hermes codegen:proto
129129

130130
- name: Generate OpenAPI SDKs
131131
run: |

examples/cactus-example-cbdc-bridging-backend/src/main/typescript/infrastructure/fabric-contracts/satp-contract/chaincode-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
77
"engines": {
8-
"node": ">=12",
8+
"node": ">=18",
99
"npm": ">=5"
1010
},
1111
"scripts": {

packages/cactus-plugin-satp-hermes/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,12 @@
6868
"build:bundle": "ncc build ./dist/lib/main/typescript/plugin-satp-hermes-gateway-cli.js --out=./dist/bundle/ncc/ --external=fabric-common --external=bufferutil --external=pg-cloudflare",
6969
"build:bundle:prod": "ncc build ./dist/lib/main/typescript/plugin-satp-hermes-gateway-cli.js --minify --out=./dist/bundle/ncc/ --external=fabric-common --external=bufferutil",
7070
"build": "run-s codegen tsc",
71-
"build-proto": "buf build --verbose",
7271
"build:dev:backend:postbuild": "",
7372
"bundle-openapi-json": "swagger-cli bundle ./src/main/yml/bol/openapi-blo.yml -o ./src/main/json/openapi-blo-bundled.json -r -t json",
7473
"bundle-openapi-yaml": "swagger-cli bundle ./src/main/yml/bol/openapi-blo.yml -o ./src/main/yml/bol/openapi-blo-bundled.yml -r -t yaml",
7574
"codegen": "run-p 'codegen:*'",
7675
"codegen:openapi": "npm run generate-sdk",
77-
"codegen:proto": "npm run generate-proto",
76+
"codegen:proto": "buf build --verbose",
7877
"db:init": "run-s db:init:local db:init:remote",
7978
"db:init:local": "knex migrate:latest --knexfile src/knex/knexfile.ts",
8079
"db:init:remote": "knex migrate:latest --knexfile src/knex/knexfile-remote.ts",
@@ -85,9 +84,8 @@
8584
"forge:build": "forge build ./src/main/solidity/contracts/*.sol --out ./src/main/solidity/generated",
8685
"forge:build:test": "forge build ./src/test/solidity/contracts/*.sol --out ./src/test/solidity/generated",
8786
"forge:test": "forge test --out ./src/test/solidity/generated",
88-
"generate-proto": "cd src/main/proto && yarn buf generate --verbose",
8987
"generate-sdk": "run-p 'generate-sdk:*'",
90-
"generate-sdk:go": "openapi-generator-cli generate -i ./src/main/yml/bol/openapi-blo-bundled.yml -g go -o ./src/main/go/generated/gateway-client --additional-properties=packageName=generated,generateInterfaces=true,packageVersion=v0.0.1,moduleName=github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated --git-user-id hyperledger --git-repo-id cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated",
88+
"generate-sdk:go": "openapi-generator-cli generate -i ./src/main/yml/bol/openapi-blo-bundled.yml -g go -o ./src/main/go/generated/gateway-client --additional-properties=packageName=generated,generateInterfaces=true,packageVersion=v0.0.1,moduleName=github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated --git-user-id hyperledger-cacti --git-repo-id cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated",
9189
"generate-sdk:typescript-axios-bol": "yarn bundle-openapi-yaml && yarn bundle-openapi-json && openapi-generator-cli generate -i ./src/main/yml/bol/openapi-blo-bundled.yml -g typescript-axios -o ./src/main/typescript/generated/gateway-client/typescript-axios/ --reserved-words-mappings protected=protected --enable-post-process-file",
9290
"lint": "run-s 'lint:*' 'lint-code'",
9391
"lint-code": "run-s format:eslint format:prettier",

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ go get golang.org/x/net/context
3232
Put the package under your project folder and add the following in import:
3333

3434
```golang
35-
import generated "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
35+
import generated "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
3636
```
3737

3838
To use a proxy, set the environment variable `HTTP_PROXY`:

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/docs/AddCounterpartyApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"context"
2626
"fmt"
2727
"os"
28-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
28+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
2929
)
3030

3131
func main() {

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/docs/AdminApi.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"context"
3131
"fmt"
3232
"os"
33-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
33+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
3434
)
3535

3636
func main() {
@@ -96,7 +96,7 @@ import (
9696
"context"
9797
"fmt"
9898
"os"
99-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
99+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
100100
)
101101

102102
func main() {
@@ -157,7 +157,7 @@ import (
157157
"context"
158158
"fmt"
159159
"os"
160-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
160+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
161161
)
162162

163163
func main() {
@@ -223,7 +223,7 @@ import (
223223
"context"
224224
"fmt"
225225
"os"
226-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
226+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
227227
)
228228

229229
func main() {
@@ -289,7 +289,7 @@ import (
289289
"context"
290290
"fmt"
291291
"os"
292-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
292+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
293293
)
294294

295295
func main() {
@@ -355,7 +355,7 @@ import (
355355
"context"
356356
"fmt"
357357
"os"
358-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
358+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
359359
)
360360

361361
func main() {

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/docs/GetApproveAddressApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"context"
2626
"fmt"
2727
"os"
28-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
28+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
2929
)
3030

3131
func main() {

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/docs/OracleApi.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"context"
2929
"fmt"
3030
"os"
31-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
31+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
3232
)
3333

3434
func main() {
@@ -94,7 +94,7 @@ import (
9494
"context"
9595
"fmt"
9696
"os"
97-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
97+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
9898
)
9999

100100
func main() {
@@ -160,7 +160,7 @@ import (
160160
"context"
161161
"fmt"
162162
"os"
163-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
163+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
164164
)
165165

166166
func main() {
@@ -226,7 +226,7 @@ import (
226226
"context"
227227
"fmt"
228228
"os"
229-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
229+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
230230
)
231231

232232
func main() {

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/docs/TransactionApi.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"context"
2929
"fmt"
3030
"os"
31-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
31+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
3232
)
3333

3434
func main() {
@@ -94,7 +94,7 @@ import (
9494
"context"
9595
"fmt"
9696
"os"
97-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
97+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
9898
)
9999

100100
func main() {
@@ -155,7 +155,7 @@ import (
155155
"context"
156156
"fmt"
157157
"os"
158-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
158+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
159159
)
160160

161161
func main() {
@@ -233,7 +233,7 @@ import (
233233
"context"
234234
"fmt"
235235
"os"
236-
openapiclient "github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
236+
openapiclient "github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated"
237237
)
238238

239239
func main() {

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/git_push.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [ "$git_host" = "" ]; then
1414
fi
1515

1616
if [ "$git_user_id" = "" ]; then
17-
git_user_id="hyperledger"
17+
git_user_id="hyperledger-cacti"
1818
echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
1919
fi
2020

packages/cactus-plugin-satp-hermes/src/main/go/generated/gateway-client/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/hyperledger/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated
1+
module github.com/hyperledger-cacti/cacti/packages/cactus-plugin-satp-hermes/src/main/go/generated
22

33
go 1.18
44

packages/cactus-plugin-satp-hermes/src/test/typescript/fabric/contracts/oracle-bl-contract/chaincode-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
77
"engines": {
8-
"node": ">=12",
8+
"node": ">=18",
99
"npm": ">=5"
1010
},
1111
"scripts": {

packages/cactus-plugin-satp-hermes/src/test/typescript/fabric/contracts/satp-contract/chaincode-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
77
"engines": {
8-
"node": ">=12",
8+
"node": ">=18",
99
"npm": ">=5"
1010
},
1111
"scripts": {

0 commit comments

Comments
 (0)