From 74e1daed3374ee8cb155855b1334d58d2a16163d Mon Sep 17 00:00:00 2001 From: D4ryl00 Date: Tue, 29 Jul 2025 17:18:50 +0200 Subject: [PATCH 1/2] feat: bump buf version and generated files Signed-off-by: D4ryl00 --- .tool-versions | 2 +- Makefile | 13 ++--------- api/gen/es/gnonativetypes_pb.ts | 6 +++--- api/gen/es/rpc_pb.ts | 6 +++--- api/package-lock.json | 38 --------------------------------- api/package.json | 10 --------- buf.gen.yaml | 2 +- expo/package-lock.json | 26 +++++++++++----------- expo/package.json | 6 +++--- gen.sum | 4 ++-- 10 files changed, 28 insertions(+), 85 deletions(-) delete mode 100644 api/package-lock.json delete mode 100644 api/package.json diff --git a/.tool-versions b/.tool-versions index a5578679..4d395e9f 100644 --- a/.tool-versions +++ b/.tool-versions @@ -4,4 +4,4 @@ cocoapods 1.15.2 java openjdk-17.0.2 yarn 1.22.19 golang 1.23.7 -buf 1.53.0 +buf 1.55.1 diff --git a/Makefile b/Makefile index 57d15db4..6008523b 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ clean: framework.clean # - API : Handle API generation and cleaning -api.generate: _api.generate.protocol _api.generate.modules +api.generate: _api.generate.protocol api.clean: _api.clean.protocol _api.clean.modules # - API - rpc @@ -86,16 +86,7 @@ $(gen_sum): $(gen_src) go mod tidy \ ) -_api.generate.modules: api/package-lock.json - -api/package-lock.json: - $(call check-program, npm) - cd api; npm install - -_api.clean.modules: - cd api; rm -fr node_modules - -.PHONY: api.generate _api.generate.protocol _api.generate.modules _api.clean.protocol _api.clean.modules +.PHONY: api.generate _api.generate.protocol _api.clean.protocol # - Bind : Handle gomobile bind diff --git a/api/gen/es/gnonativetypes_pb.ts b/api/gen/es/gnonativetypes_pb.ts index f83a19e5..e54c26b1 100644 --- a/api/gen/es/gnonativetypes_pb.ts +++ b/api/gen/es/gnonativetypes_pb.ts @@ -1,9 +1,9 @@ -// @generated by protoc-gen-es v2.2.5 with parameter "target=ts" +// @generated by protoc-gen-es v2.6.2 with parameter "target=ts" // @generated from file gnonativetypes.proto (package land.gno.gnonative.v1, syntax proto3) /* eslint-disable */ -import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1"; -import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1"; +import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2"; +import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2"; import type { Message } from "@bufbuild/protobuf"; /** diff --git a/api/gen/es/rpc_pb.ts b/api/gen/es/rpc_pb.ts index 3a16a619..8f15f156 100644 --- a/api/gen/es/rpc_pb.ts +++ b/api/gen/es/rpc_pb.ts @@ -1,9 +1,9 @@ -// @generated by protoc-gen-es v2.2.5 with parameter "target=ts" +// @generated by protoc-gen-es v2.6.2 with parameter "target=ts" // @generated from file rpc.proto (package land.gno.gnonative.v1, syntax proto3) /* eslint-disable */ -import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1"; -import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1"; +import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2"; +import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2"; import type { ActivateAccountRequestSchema, ActivateAccountResponseSchema, AddressFromBech32RequestSchema, AddressFromBech32ResponseSchema, AddressFromMnemonicRequestSchema, AddressFromMnemonicResponseSchema, AddressToBech32RequestSchema, AddressToBech32ResponseSchema, BroadcastTxCommitRequestSchema, BroadcastTxCommitResponseSchema, CallRequestSchema, CallResponseSchema, CreateAccountRequestSchema, CreateAccountResponseSchema, CreateLedgerRequestSchema, CreateLedgerResponseSchema, DeleteAccountRequestSchema, DeleteAccountResponseSchema, EstimateGasRequestSchema, EstimateGasResponseSchema, GenerateRecoveryPhraseRequestSchema, GenerateRecoveryPhraseResponseSchema, GetActivatedAccountRequestSchema, GetActivatedAccountResponseSchema, GetChainIDRequestSchema, GetChainIDResponseSchema, GetKeyInfoByAddressRequestSchema, GetKeyInfoByAddressResponseSchema, GetKeyInfoByNameOrAddressRequestSchema, GetKeyInfoByNameOrAddressResponseSchema, GetKeyInfoByNameRequestSchema, GetKeyInfoByNameResponseSchema, GetRemoteRequestSchema, GetRemoteResponseSchema, HasKeyByAddressRequestSchema, HasKeyByAddressResponseSchema, HasKeyByNameOrAddressRequestSchema, HasKeyByNameOrAddressResponseSchema, HasKeyByNameRequestSchema, HasKeyByNameResponseSchema, HelloRequestSchema, HelloResponseSchema, HelloStreamRequestSchema, HelloStreamResponseSchema, ListKeyInfoRequestSchema, ListKeyInfoResponseSchema, MakeTxResponseSchema, QEvalRequestSchema, QEvalResponseSchema, QueryAccountRequestSchema, QueryAccountResponseSchema, QueryRequestSchema, QueryResponseSchema, RenderRequestSchema, RenderResponseSchema, RotatePasswordRequestSchema, RotatePasswordResponseSchema, RunRequestSchema, RunResponseSchema, SendRequestSchema, SendResponseSchema, SetChainIDRequestSchema, SetChainIDResponseSchema, SetPasswordRequestSchema, SetPasswordResponseSchema, SetRemoteRequestSchema, SetRemoteResponseSchema, SignTxRequestSchema, SignTxResponseSchema, ValidateMnemonicPhraseRequestSchema, ValidateMnemonicPhraseResponseSchema, ValidateMnemonicWordRequestSchema, ValidateMnemonicWordResponseSchema } from "./gnonativetypes_pb"; import { file_gnonativetypes } from "./gnonativetypes_pb"; import type { Message } from "@bufbuild/protobuf"; diff --git a/api/package-lock.json b/api/package-lock.json deleted file mode 100644 index 918783e5..00000000 --- a/api/package-lock.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "api", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "api", - "version": "1.0.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.6", - "@bufbuild/protobuf": "^1.7.2" - } - }, - "node_modules/@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", - "dependencies": { - "regenerator-runtime": "^0.14.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@bufbuild/protobuf": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.10.0.tgz", - "integrity": "sha512-QDdVFLoN93Zjg36NoQPZfsVH9tZew7wKDKyV5qRdj8ntT4wQCOradQjRaTdwMhWUYsgKsvCINKKm87FdEk96Ag==" - }, - "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" - } - } -} diff --git a/api/package.json b/api/package.json deleted file mode 100644 index 73187af5..00000000 --- a/api/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "api", - "version": "1.0.0", - "main": "index.js", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.6", - "@bufbuild/protobuf": "^1.7.2" - } -} diff --git a/buf.gen.yaml b/buf.gen.yaml index 4ec79ca7..17e8799c 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -6,7 +6,7 @@ plugins: - remote: buf.build/connectrpc/go out: ./api/gen/go opt: module=github.com/gnolang/gnonative/v4/api/gen/go - - remote: buf.build/bufbuild/es:v2.2.5 + - remote: buf.build/bufbuild/es:v2.6.2 opt: target=ts out: ./api/gen/es - remote: buf.build/protocolbuffers/csharp diff --git a/expo/package-lock.json b/expo/package-lock.json index 9d18d075..bc267bfa 100644 --- a/expo/package-lock.json +++ b/expo/package-lock.json @@ -9,9 +9,9 @@ "version": "0.1.2", "license": "MIT", "dependencies": { - "@bufbuild/protobuf": "^2.2.5", - "@connectrpc/connect": "^2.0.2", - "@connectrpc/connect-web": "^2.0.2", + "@bufbuild/protobuf": "^2.6.2", + "@connectrpc/connect": "^2.0.3", + "@connectrpc/connect-web": "^2.0.3", "base64-js": "^1.5.1", "fast-text-encoding": "^1.0.6" }, @@ -2307,28 +2307,28 @@ "peer": true }, "node_modules/@bufbuild/protobuf": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.5.tgz", - "integrity": "sha512-/g5EzJifw5GF8aren8wZ/G5oMuPoGeS6MQD3ca8ddcvdXR5UELUfdTZITCGNhNXynY/AYl3Z4plmxdj/tRl/hQ==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.6.2.tgz", + "integrity": "sha512-vLu7SRY84CV/Dd+NUdgtidn2hS5hSMUC1vDBY0VcviTdgRYkU43vIz3vIFbmx14cX1r+mM7WjzE5Fl1fGEM0RQ==", "license": "(Apache-2.0 AND BSD-3-Clause)" }, "node_modules/@connectrpc/connect": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@connectrpc/connect/-/connect-2.0.2.tgz", - "integrity": "sha512-xZuylIUNvNlH52e/4eQsZvY4QZyDJRtEFEDnn/yBrv5Xi5ZZI/p8X+GAHH35ucVaBvv9u7OzHZo8+tEh1EFTxA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@connectrpc/connect/-/connect-2.0.3.tgz", + "integrity": "sha512-jAbVMHVtDCydGt2P20VpmLjbLtERqSV0RMSyQF3k2zhK8pzQ2QaCAcyVhufClqrOAFZUKL5BqVYtttaxvhmRgg==", "license": "Apache-2.0", "peerDependencies": { "@bufbuild/protobuf": "^2.2.0" } }, "node_modules/@connectrpc/connect-web": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@connectrpc/connect-web/-/connect-web-2.0.2.tgz", - "integrity": "sha512-QANMFPiL2o66BdBEctg4TsQLe5ozsBLqcle3dCBp7BwGlNGTY6NnNnqmt+YRnpeMW88GgomJwWNMGCrRD9pRKA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@connectrpc/connect-web/-/connect-web-2.0.3.tgz", + "integrity": "sha512-w4LZ2Ci+NW/kcMoHnoczJgyGTmxuv/MQ+tTm2UNL40HimXKWYCAna/fV0AbHRnTiteiwEBpeSCaxF34MetzhAw==", "license": "Apache-2.0", "peerDependencies": { "@bufbuild/protobuf": "^2.2.0", - "@connectrpc/connect": "2.0.2" + "@connectrpc/connect": "2.0.3" } }, "node_modules/@eslint-community/eslint-utils": { diff --git a/expo/package.json b/expo/package.json index 8f06af40..d3b66810 100644 --- a/expo/package.json +++ b/expo/package.json @@ -29,9 +29,9 @@ "license": "MIT", "homepage": "https://github.com/gnolang/gnonative#readme", "dependencies": { - "@bufbuild/protobuf": "^2.2.5", - "@connectrpc/connect": "^2.0.2", - "@connectrpc/connect-web": "^2.0.2", + "@bufbuild/protobuf": "^2.6.2", + "@connectrpc/connect": "^2.0.3", + "@connectrpc/connect-web": "^2.0.3", "base64-js": "^1.5.1", "fast-text-encoding": "^1.0.6" }, diff --git a/gen.sum b/gen.sum index 00d2a93a..3ebd959a 100644 --- a/gen.sum +++ b/gen.sum @@ -2,5 +2,5 @@ 4606ed9c6426464cc8c4d11ec15abbd6f32cdb8f api/gnonativetypes/gnonativetypes.go 5c1423cfce48514cbb29ce4a76e3a7017c055ba0 api/gnonativetypes/package.go 5e9ce9eb1815d8d2771fe948fb20223df36ff182 api/rpc.proto -6444ae88d6497a551ba1d5d611e1f81b1ce6a21c buf.gen.yaml -db011306fec5f34668398da58861399025f4abc8 Makefile +426b4aee8f1f2b045062c7c745b4d3559d59daf9 buf.gen.yaml +0ddc44778932b2b732cee2f9816d688838290e2a Makefile From 513642875ef1e9cfcbd8595886f5b254a2f84351 Mon Sep 17 00:00:00 2001 From: D4ryl00 Date: Tue, 29 Jul 2025 18:16:08 +0200 Subject: [PATCH 2/2] fix: Makefile Signed-off-by: D4ryl00 --- Makefile | 2 +- gen.sum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6008523b..a4e0e63e 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ clean: framework.clean # - API : Handle API generation and cleaning api.generate: _api.generate.protocol -api.clean: _api.clean.protocol _api.clean.modules +api.clean: _api.clean.protocol # - API - rpc diff --git a/gen.sum b/gen.sum index 3ebd959a..c728e944 100644 --- a/gen.sum +++ b/gen.sum @@ -3,4 +3,4 @@ 5c1423cfce48514cbb29ce4a76e3a7017c055ba0 api/gnonativetypes/package.go 5e9ce9eb1815d8d2771fe948fb20223df36ff182 api/rpc.proto 426b4aee8f1f2b045062c7c745b4d3559d59daf9 buf.gen.yaml -0ddc44778932b2b732cee2f9816d688838290e2a Makefile +cfa69b131531fcb5ca340fbede8c7ccf094d62bb Makefile