From dd7b435e3aed2be1fc35c43c5fa5f85166fc3154 Mon Sep 17 00:00:00 2001 From: Zetazzz Date: Thu, 11 Jul 2024 16:02:50 +0800 Subject: [PATCH] fix fixtures --- .../google/protobuf/descriptor.ts | 10 +- .../google/protobuf/descriptor.ts | 10 +- .../google/protobuf/descriptor.ts | 10 +- .../google/protobuf/descriptor.ts | 9 +- .../google/protobuf/descriptor.ts | 10 +- .../google/protobuf/descriptor.ts | 10 +- .../google/protobuf/descriptor.ts | 10 +- .../google/protobuf/descriptor.ts | 9 +- .../google/protobuf/descriptor.ts | 9 +- .../google/protobuf/descriptor.ts | 9 +- .../no-amino/google/protobuf/descriptor.ts | 9 +- .../google/protobuf/descriptor.ts | 9 +- .../proto-only/google/protobuf/descriptor.ts | 9 +- .../misc/output/google/protobuf/descriptor.ts | 10 +- .../output1/cosmwasm/wasm/v1/query.ts | 6 +- .../output1/evmos/incentives/v1/query.ts | 4 - .../output1/google/protobuf/descriptor.ts | 9 +- __fixtures__/output1/osmosis/lockup/lock.ts | 20 ++-- .../output1/osmosis/lockup/tx.amino.ts | 18 +-- __fixtures__/output1/osmosis/lockup/tx.ts | 80 +++++++------- __fixtures__/output1/osmosis/superfluid/tx.ts | 20 ++-- __fixtures__/output1/tendermint/abci/types.ts | 7 +- .../output1/tendermint/types/types.ts | 2 + .../output2/cosmwasm/wasm/v1/query.ts | 6 +- .../output2/evmos/incentives/v1/query.ts | 4 - .../output2/google/protobuf/descriptor.ts | 9 +- __fixtures__/output2/osmosis/lockup/lock.ts | 16 +-- __fixtures__/output2/osmosis/lockup/tx.ts | 64 +++++------ __fixtures__/output2/osmosis/superfluid/tx.ts | 16 +-- __fixtures__/output2/tendermint/abci/types.ts | 7 +- .../output2/tendermint/types/types.ts | 2 + .../cosmwasm/wasm/v1/query.ts | 6 +- .../evmos/incentives/v1/query.ts | 4 - .../google/protobuf/descriptor.ts | 9 +- .../outputinstantrpc/osmosis/lockup/lock.ts | 26 ++--- .../osmosis/lockup/tx.amino.ts | 18 +-- .../outputinstantrpc/osmosis/lockup/tx.ts | 104 +++++++++--------- .../outputinstantrpc/osmosis/superfluid/tx.ts | 26 ++--- .../outputinstantrpc/tendermint/abci/types.ts | 7 +- .../tendermint/types/types.ts | 2 + .../outputosmojs/cosmwasm/wasm/v1/query.ts | 6 +- .../outputosmojs/evmos/incentives/v1/query.ts | 4 - .../google/protobuf/descriptor.ts | 9 +- .../outputosmojs/osmosis/lockup/lock.ts | 24 ++-- .../outputosmojs/osmosis/lockup/tx.amino.ts | 18 +-- .../v-next/outputosmojs/osmosis/lockup/tx.ts | 96 ++++++++-------- .../outputosmojs/osmosis/superfluid/tx.ts | 24 ++-- .../outputosmojs/tendermint/abci/types.ts | 7 +- .../outputosmojs/tendermint/types/types.ts | 2 + .../outputsign/cosmwasm/wasm/v1/query.ts | 12 +- .../outputsign/evmos/incentives/v1/query.ts | 8 -- .../outputsign/google/protobuf/descriptor.ts | 10 +- .../v-next/outputsign/osmosis/lockup/lock.ts | 18 +-- .../v-next/outputsign/osmosis/lockup/tx.ts | 72 ++++++------ .../outputsign/osmosis/superfluid/tx.ts | 18 +-- .../outputsign/tendermint/abci/types.ts | 14 +-- .../outputsign/tendermint/types/types.ts | 4 + .../v-next/outputv2/cosmwasm/wasm/v1/query.ts | 12 +- .../outputv2/evmos/incentives/v1/query.ts | 8 -- .../outputv2/google/protobuf/descriptor.ts | 10 +- .../v-next/outputv2/osmosis/lockup/lock.ts | 26 ++--- .../v-next/outputv2/osmosis/lockup/tx.ts | 104 +++++++++--------- .../v-next/outputv2/osmosis/superfluid/tx.ts | 26 ++--- .../v-next/outputv2/tendermint/abci/types.ts | 14 +-- .../v-next/outputv2/tendermint/types/types.ts | 4 + .../v-next/outputv3/cosmwasm/wasm/v1/query.ts | 12 +- .../outputv3/evmos/incentives/v1/query.ts | 8 -- .../outputv3/google/protobuf/descriptor.ts | 10 +- .../v-next/outputv3/osmosis/lockup/lock.ts | 24 ++-- .../v-next/outputv3/osmosis/lockup/tx.ts | 96 ++++++++-------- .../v-next/outputv3/osmosis/superfluid/tx.ts | 24 ++-- .../v-next/outputv3/tendermint/abci/types.ts | 14 +-- .../v-next/outputv3/tendermint/types/types.ts | 4 + .../v-next/outputv4/cosmwasm/wasm/v1/query.ts | 6 +- .../outputv4/evmos/incentives/v1/query.ts | 4 - .../outputv4/google/protobuf/descriptor.ts | 9 +- .../v-next/outputv4/osmosis/lockup/lock.ts | 26 ++--- .../outputv4/osmosis/lockup/tx.amino.ts | 18 +-- .../v-next/outputv4/osmosis/lockup/tx.ts | 104 +++++++++--------- .../v-next/outputv4/osmosis/superfluid/tx.ts | 26 ++--- .../v-next/outputv4/tendermint/abci/types.ts | 7 +- .../v-next/outputv4/tendermint/types/types.ts | 2 + 82 files changed, 740 insertions(+), 829 deletions(-) diff --git a/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts b/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts index cbba0c4e80..a325ca4f4d 100644 --- a/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-impl-interfaces-gen/google/protobuf/descriptor.ts @@ -32,6 +32,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -193,12 +194,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -394,6 +392,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -431,6 +430,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts index d0ab236df6..a388397cd6 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/protobuf/descriptor.ts @@ -32,6 +32,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -193,12 +194,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -438,6 +436,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -475,6 +474,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts index df7f0111b3..0aec87790f 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/google/protobuf/descriptor.ts @@ -32,6 +32,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -193,12 +194,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -438,6 +436,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -475,6 +474,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts index 8315b68154..fa401acf9c 100644 --- a/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-legacy/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -419,6 +417,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts index 82c7fb96c4..f8da98a547 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -192,12 +193,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -437,6 +435,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -474,6 +473,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts index 6f80a4fe59..fe800d0760 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -192,12 +193,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -437,6 +435,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -474,6 +473,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts index c3e3b3a76d..272508c1cb 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -192,12 +193,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -433,6 +431,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -470,6 +469,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/google/protobuf/descriptor.ts index 434691c414..f5bdfa8fc5 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -415,6 +413,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts index 8315b68154..fa401acf9c 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-legacy/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -419,6 +417,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output-proto-amino/no-amino-no-proto/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/no-amino-no-proto/google/protobuf/descriptor.ts index 434691c414..f5bdfa8fc5 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino-no-proto/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino-no-proto/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -415,6 +413,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts index 8315b68154..fa401acf9c 100644 --- a/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/no-amino/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -419,6 +417,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/protobuf/descriptor.ts index 1a01cd1cd6..4835a9c87c 100644 --- a/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -419,6 +417,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output-proto-amino/proto-only/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/proto-only/google/protobuf/descriptor.ts index 1a01cd1cd6..4835a9c87c 100644 --- a/__fixtures__/misc/output-proto-amino/proto-only/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/proto-only/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -419,6 +417,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/misc/output/google/protobuf/descriptor.ts b/__fixtures__/misc/output/google/protobuf/descriptor.ts index 82c7fb96c4..f8da98a547 100644 --- a/__fixtures__/misc/output/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -192,12 +193,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -437,6 +435,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -474,6 +473,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/output1/cosmwasm/wasm/v1/query.ts b/__fixtures__/output1/cosmwasm/wasm/v1/query.ts index 9ccb6efcb9..011b8b6034 100644 --- a/__fixtures__/output1/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/output1/cosmwasm/wasm/v1/query.ts @@ -76,11 +76,9 @@ export interface QueryContractHistoryResponseSDKType { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: Long; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } /** diff --git a/__fixtures__/output1/evmos/incentives/v1/query.ts b/__fixtures__/output1/evmos/incentives/v1/query.ts index a4df01c9bd..5d49c5f7b5 100644 --- a/__fixtures__/output1/evmos/incentives/v1/query.ts +++ b/__fixtures__/output1/evmos/incentives/v1/query.ts @@ -113,10 +113,6 @@ export interface QueryGasMeterRequestSDKType { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: Long; } /** diff --git a/__fixtures__/output1/google/protobuf/descriptor.ts b/__fixtures__/output1/google/protobuf/descriptor.ts index 671f68d619..08a68eeae6 100644 --- a/__fixtures__/output1/google/protobuf/descriptor.ts +++ b/__fixtures__/output1/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -372,6 +370,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/output1/osmosis/lockup/lock.ts b/__fixtures__/output1/osmosis/lockup/lock.ts index efde996399..56bc1f282d 100644 --- a/__fixtures__/output1/osmosis/lockup/lock.ts +++ b/__fixtures__/output1/osmosis/lockup/lock.ts @@ -53,7 +53,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: Long; + iD: Long; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -163,7 +163,7 @@ export interface SyntheticLockSDKType { } function createBasePeriodLock(): PeriodLock { return { - ID: Long.UZERO, + iD: Long.UZERO, owner: "", duration: Duration.fromPartial({}), endTime: new Date(), @@ -172,8 +172,8 @@ function createBasePeriodLock(): PeriodLock { } export const PeriodLock = { encode(message: PeriodLock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.ID.isZero()) { - writer.uint32(8).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== "") { writer.uint32(18).string(message.owner); @@ -197,7 +197,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 2: message.owner = reader.string(); @@ -220,7 +220,7 @@ export const PeriodLock = { }, fromJSON(object: any): PeriodLock { return { - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, owner: isSet(object.owner) ? String(object.owner) : "", duration: isSet(object.duration) ? Duration.fromJSON(object.duration) : undefined, endTime: isSet(object.endTime) ? fromJsonTimestamp(object.endTime) : undefined, @@ -229,7 +229,7 @@ export const PeriodLock = { }, toJSON(message: PeriodLock): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); message.owner !== undefined && (obj.owner = message.owner); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); message.endTime !== undefined && (obj.endTime = message.endTime.toISOString()); @@ -242,7 +242,7 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.owner = object.owner ?? ""; message.duration = object.duration !== undefined && object.duration !== null ? Duration.fromPartial(object.duration) : undefined; message.endTime = object.endTime ?? undefined; @@ -251,7 +251,7 @@ export const PeriodLock = { }, fromSDK(object: PeriodLockSDKType): PeriodLock { return { - ID: object?.ID, + iD: object?.ID, owner: object?.owner, duration: object.duration ? Duration.fromSDK(object.duration) : undefined, endTime: object.end_time ? Timestamp.fromSDK(object.end_time) : undefined, @@ -260,7 +260,7 @@ export const PeriodLock = { }, toSDK(message: PeriodLock): PeriodLockSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); message.endTime !== undefined && (obj.end_time = message.endTime ? Timestamp.toSDK(message.endTime) : undefined); diff --git a/__fixtures__/output1/osmosis/lockup/tx.amino.ts b/__fixtures__/output1/osmosis/lockup/tx.amino.ts index 0bb3390ab8..32976d951e 100644 --- a/__fixtures__/output1/osmosis/lockup/tx.amino.ts +++ b/__fixtures__/output1/osmosis/lockup/tx.amino.ts @@ -114,12 +114,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/begin-unlock-period-lock", toAmino: ({ owner, - ID, + iD, coins }: MsgBeginUnlocking): MsgBeginUnlockingAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -133,7 +133,7 @@ export const AminoConverter = { }: MsgBeginUnlockingAminoType["value"]): MsgBeginUnlocking => { return { owner, - ID: Long.fromString(ID), + iD: Long.fromString(ID), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -145,12 +145,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/extend-lockup", toAmino: ({ owner, - ID, + iD, duration }: MsgExtendLockup): MsgExtendLockupAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), duration: (duration * 1_000_000_000).toString() }; }, @@ -161,7 +161,7 @@ export const AminoConverter = { }: MsgExtendLockupAminoType["value"]): MsgExtendLockup => { return { owner, - ID: Long.fromString(ID), + iD: Long.fromString(ID), duration: { seconds: Long.fromNumber(Math.floor(parseInt(duration) / 1_000_000_000)), nanos: parseInt(duration) % 1_000_000_000 @@ -173,12 +173,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/force-unlock", toAmino: ({ owner, - ID, + iD, coins }: MsgForceUnlock): MsgForceUnlockAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -192,7 +192,7 @@ export const AminoConverter = { }: MsgForceUnlockAminoType["value"]): MsgForceUnlock => { return { owner, - ID: Long.fromString(ID), + iD: Long.fromString(ID), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount diff --git a/__fixtures__/output1/osmosis/lockup/tx.ts b/__fixtures__/output1/osmosis/lockup/tx.ts index ce6196c3a5..15be8eeee9 100644 --- a/__fixtures__/output1/osmosis/lockup/tx.ts +++ b/__fixtures__/output1/osmosis/lockup/tx.ts @@ -16,7 +16,7 @@ export interface MsgLockTokensSDKType { coins: CoinSDKType[]; } export interface MsgLockTokensResponse { - ID: Long; + iD: Long; } export interface MsgLockTokensResponseSDKType { ID: Long; @@ -35,7 +35,7 @@ export interface MsgBeginUnlockingAllResponseSDKType { } export interface MsgBeginUnlocking { owner: string; - ID: Long; + iD: Long; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -56,7 +56,7 @@ export interface MsgBeginUnlockingResponseSDKType { */ export interface MsgExtendLockup { owner: string; - ID: Long; + iD: Long; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -84,7 +84,7 @@ export interface MsgExtendLockupResponseSDKType { */ export interface MsgForceUnlock { owner: string; - ID: Long; + iD: Long; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -192,13 +192,13 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: Long.UZERO + iD: Long.UZERO }; } export const MsgLockTokensResponse = { encode(message: MsgLockTokensResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.ID.isZero()) { - writer.uint32(8).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -210,7 +210,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; default: reader.skipType(tag & 7); @@ -221,27 +221,27 @@ export const MsgLockTokensResponse = { }, fromJSON(object: any): MsgLockTokensResponse { return { - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO }; }, toJSON(message: MsgLockTokensResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; return message; }, fromSDK(object: MsgLockTokensResponseSDKType): MsgLockTokensResponse { return { - ID: object?.ID + iD: object?.ID }; }, toSDK(message: MsgLockTokensResponse): MsgLockTokensResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; } }; @@ -366,7 +366,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: Long.UZERO, + iD: Long.UZERO, coins: [] }; } @@ -375,8 +375,8 @@ export const MsgBeginUnlocking = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.ID.isZero()) { - writer.uint32(16).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -394,7 +394,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -409,14 +409,14 @@ export const MsgBeginUnlocking = { fromJSON(object: any): MsgBeginUnlocking { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] }; }, toJSON(message: MsgBeginUnlocking): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -427,21 +427,21 @@ export const MsgBeginUnlocking = { fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; }, fromSDK(object: MsgBeginUnlockingSDKType): MsgBeginUnlocking { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, toSDK(message: MsgBeginUnlocking): MsgBeginUnlockingSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -508,7 +508,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: Long.UZERO, + iD: Long.UZERO, duration: Duration.fromPartial({}) }; } @@ -517,8 +517,8 @@ export const MsgExtendLockup = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.ID.isZero()) { - writer.uint32(16).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -536,7 +536,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 3: message.duration = Duration.decode(reader, reader.uint32()); @@ -551,35 +551,35 @@ export const MsgExtendLockup = { fromJSON(object: any): MsgExtendLockup { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, duration: isSet(object.duration) ? Duration.fromJSON(object.duration) : undefined }; }, toJSON(message: MsgExtendLockup): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); return obj; }, fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.duration = object.duration !== undefined && object.duration !== null ? Duration.fromPartial(object.duration) : undefined; return message; }, fromSDK(object: MsgExtendLockupSDKType): MsgExtendLockup { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, duration: object.duration ? Duration.fromSDK(object.duration) : undefined }; }, toSDK(message: MsgExtendLockup): MsgExtendLockupSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; } @@ -642,7 +642,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: Long.UZERO, + iD: Long.UZERO, coins: [] }; } @@ -651,8 +651,8 @@ export const MsgForceUnlock = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.ID.isZero()) { - writer.uint32(16).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -670,7 +670,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -685,14 +685,14 @@ export const MsgForceUnlock = { fromJSON(object: any): MsgForceUnlock { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] }; }, toJSON(message: MsgForceUnlock): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -703,21 +703,21 @@ export const MsgForceUnlock = { fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; }, fromSDK(object: MsgForceUnlockSDKType): MsgForceUnlock { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, toSDK(message: MsgForceUnlock): MsgForceUnlockSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { diff --git a/__fixtures__/output1/osmosis/superfluid/tx.ts b/__fixtures__/output1/osmosis/superfluid/tx.ts index 430b2ff84d..e05e508022 100644 --- a/__fixtures__/output1/osmosis/superfluid/tx.ts +++ b/__fixtures__/output1/osmosis/superfluid/tx.ts @@ -56,7 +56,7 @@ export interface MsgLockAndSuperfluidDelegateSDKType { val_addr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: Long; + iD: Long; } export interface MsgLockAndSuperfluidDelegateResponseSDKType { ID: Long; @@ -517,13 +517,13 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: Long.UZERO + iD: Long.UZERO }; } export const MsgLockAndSuperfluidDelegateResponse = { encode(message: MsgLockAndSuperfluidDelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.ID.isZero()) { - writer.uint32(8).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -535,7 +535,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; default: reader.skipType(tag & 7); @@ -546,27 +546,27 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromJSON(object: any): MsgLockAndSuperfluidDelegateResponse { return { - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO }; }, toJSON(message: MsgLockAndSuperfluidDelegateResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; return message; }, fromSDK(object: MsgLockAndSuperfluidDelegateResponseSDKType): MsgLockAndSuperfluidDelegateResponse { return { - ID: object?.ID + iD: object?.ID }; }, toSDK(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; } }; diff --git a/__fixtures__/output1/tendermint/abci/types.ts b/__fixtures__/output1/tendermint/abci/types.ts index c3f71c3907..6722825394 100644 --- a/__fixtures__/output1/tendermint/abci/types.ts +++ b/__fixtures__/output1/tendermint/abci/types.ts @@ -668,12 +668,9 @@ export interface TxResultSDKType { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: Long; } /** Validator */ diff --git a/__fixtures__/output1/tendermint/types/types.ts b/__fixtures__/output1/tendermint/types/types.ts index 3fa5e1b859..95d01a9c22 100644 --- a/__fixtures__/output1/tendermint/types/types.ts +++ b/__fixtures__/output1/tendermint/types/types.ts @@ -137,6 +137,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -146,6 +147,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array; diff --git a/__fixtures__/output2/cosmwasm/wasm/v1/query.ts b/__fixtures__/output2/cosmwasm/wasm/v1/query.ts index a3901a1bc9..09be5e2fe5 100644 --- a/__fixtures__/output2/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/output2/cosmwasm/wasm/v1/query.ts @@ -47,11 +47,9 @@ export interface QueryContractHistoryResponse { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: Long; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } /** diff --git a/__fixtures__/output2/evmos/incentives/v1/query.ts b/__fixtures__/output2/evmos/incentives/v1/query.ts index fb05612302..d6f8e2d7d5 100644 --- a/__fixtures__/output2/evmos/incentives/v1/query.ts +++ b/__fixtures__/output2/evmos/incentives/v1/query.ts @@ -68,10 +68,6 @@ export interface QueryGasMeterRequest { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: Long; } /** diff --git a/__fixtures__/output2/google/protobuf/descriptor.ts b/__fixtures__/output2/google/protobuf/descriptor.ts index d873d981d9..fa4e7e3a50 100644 --- a/__fixtures__/output2/google/protobuf/descriptor.ts +++ b/__fixtures__/output2/google/protobuf/descriptor.ts @@ -33,6 +33,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -361,6 +359,7 @@ export interface FileDescriptorSet { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/output2/osmosis/lockup/lock.ts b/__fixtures__/output2/osmosis/lockup/lock.ts index a414d847dc..e5f5839a8b 100644 --- a/__fixtures__/output2/osmosis/lockup/lock.ts +++ b/__fixtures__/output2/osmosis/lockup/lock.ts @@ -54,7 +54,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: Long; + iD: Long; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -127,7 +127,7 @@ export interface SyntheticLock { } function createBasePeriodLock(): PeriodLock { return { - ID: Long.UZERO, + iD: Long.UZERO, owner: "", duration: Duration.fromPartial({}), endTime: Timestamp.fromPartial({}), @@ -136,8 +136,8 @@ function createBasePeriodLock(): PeriodLock { } export const PeriodLock = { encode(message: PeriodLock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.ID.isZero()) { - writer.uint32(8).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== "") { writer.uint32(18).string(message.owner); @@ -161,7 +161,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 2: message.owner = reader.string(); @@ -184,7 +184,7 @@ export const PeriodLock = { }, fromJSON(object: any): PeriodLock { return { - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, owner: isSet(object.owner) ? String(object.owner) : "", duration: isSet(object.duration) ? Duration.fromJSON(object.duration) : undefined, endTime: isSet(object.endTime) ? fromJsonTimestamp(object.endTime) : undefined, @@ -193,7 +193,7 @@ export const PeriodLock = { }, toJSON(message: PeriodLock): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); message.owner !== undefined && (obj.owner = message.owner); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); message.endTime !== undefined && (obj.endTime = fromTimestamp(message.endTime).toISOString()); @@ -206,7 +206,7 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.owner = object.owner ?? ""; message.duration = object.duration !== undefined && object.duration !== null ? Duration.fromPartial(object.duration) : undefined; message.endTime = object.endTime !== undefined && object.endTime !== null ? Timestamp.fromPartial(object.endTime) : undefined; diff --git a/__fixtures__/output2/osmosis/lockup/tx.ts b/__fixtures__/output2/osmosis/lockup/tx.ts index c354b11fc2..32dbb5305c 100644 --- a/__fixtures__/output2/osmosis/lockup/tx.ts +++ b/__fixtures__/output2/osmosis/lockup/tx.ts @@ -13,7 +13,7 @@ export interface MsgLockTokens { coins: Coin[]; } export interface MsgLockTokensResponse { - ID: Long; + iD: Long; } export interface MsgBeginUnlockingAll { owner: string; @@ -23,7 +23,7 @@ export interface MsgBeginUnlockingAllResponse { } export interface MsgBeginUnlocking { owner: string; - ID: Long; + iD: Long; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -36,7 +36,7 @@ export interface MsgBeginUnlockingResponse { */ export interface MsgExtendLockup { owner: string; - ID: Long; + iD: Long; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -52,7 +52,7 @@ export interface MsgExtendLockupResponse { */ export interface MsgForceUnlock { owner: string; - ID: Long; + iD: Long; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -130,13 +130,13 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: Long.UZERO + iD: Long.UZERO }; } export const MsgLockTokensResponse = { encode(message: MsgLockTokensResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.ID.isZero()) { - writer.uint32(8).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -148,7 +148,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; default: reader.skipType(tag & 7); @@ -159,17 +159,17 @@ export const MsgLockTokensResponse = { }, fromJSON(object: any): MsgLockTokensResponse { return { - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO }; }, toJSON(message: MsgLockTokensResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; return message; } }; @@ -270,7 +270,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: Long.UZERO, + iD: Long.UZERO, coins: [] }; } @@ -279,8 +279,8 @@ export const MsgBeginUnlocking = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.ID.isZero()) { - writer.uint32(16).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -298,7 +298,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -313,14 +313,14 @@ export const MsgBeginUnlocking = { fromJSON(object: any): MsgBeginUnlocking { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] }; }, toJSON(message: MsgBeginUnlocking): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -331,7 +331,7 @@ export const MsgBeginUnlocking = { fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; } @@ -384,7 +384,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: Long.UZERO, + iD: Long.UZERO, duration: Duration.fromPartial({}) }; } @@ -393,8 +393,8 @@ export const MsgExtendLockup = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.ID.isZero()) { - writer.uint32(16).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -412,7 +412,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 3: message.duration = Duration.decode(reader, reader.uint32()); @@ -427,21 +427,21 @@ export const MsgExtendLockup = { fromJSON(object: any): MsgExtendLockup { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, duration: isSet(object.duration) ? Duration.fromJSON(object.duration) : undefined }; }, toJSON(message: MsgExtendLockup): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); return obj; }, fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.duration = object.duration !== undefined && object.duration !== null ? Duration.fromPartial(object.duration) : undefined; return message; } @@ -494,7 +494,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: Long.UZERO, + iD: Long.UZERO, coins: [] }; } @@ -503,8 +503,8 @@ export const MsgForceUnlock = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.ID.isZero()) { - writer.uint32(16).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -522,7 +522,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -537,14 +537,14 @@ export const MsgForceUnlock = { fromJSON(object: any): MsgForceUnlock { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO, + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] }; }, toJSON(message: MsgForceUnlock): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -555,7 +555,7 @@ export const MsgForceUnlock = { fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; } diff --git a/__fixtures__/output2/osmosis/superfluid/tx.ts b/__fixtures__/output2/osmosis/superfluid/tx.ts index 97f98db30f..b98cf24c25 100644 --- a/__fixtures__/output2/osmosis/superfluid/tx.ts +++ b/__fixtures__/output2/osmosis/superfluid/tx.ts @@ -32,7 +32,7 @@ export interface MsgLockAndSuperfluidDelegate { valAddr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: Long; + iD: Long; } /** * MsgUnPoolWhitelistedPool Unpools every lock the sender has, that is @@ -396,13 +396,13 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: Long.UZERO + iD: Long.UZERO }; } export const MsgLockAndSuperfluidDelegateResponse = { encode(message: MsgLockAndSuperfluidDelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.ID.isZero()) { - writer.uint32(8).uint64(message.ID); + if (!message.iD.isZero()) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -414,7 +414,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = (reader.uint64() as Long); + message.iD = (reader.uint64() as Long); break; default: reader.skipType(tag & 7); @@ -425,17 +425,17 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromJSON(object: any): MsgLockAndSuperfluidDelegateResponse { return { - ID: isSet(object.ID) ? Long.fromValue(object.ID) : Long.UZERO + iD: isSet(object.iD) ? Long.fromValue(object.iD) : Long.UZERO }; }, toJSON(message: MsgLockAndSuperfluidDelegateResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || Long.UZERO).toString()); + message.iD !== undefined && (obj.iD = (message.iD || Long.UZERO).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - message.ID = object.ID !== undefined && object.ID !== null ? Long.fromValue(object.ID) : Long.UZERO; + message.iD = object.iD !== undefined && object.iD !== null ? Long.fromValue(object.iD) : Long.UZERO; return message; } }; diff --git a/__fixtures__/output2/tendermint/abci/types.ts b/__fixtures__/output2/tendermint/abci/types.ts index da56006764..78f039c325 100644 --- a/__fixtures__/output2/tendermint/abci/types.ts +++ b/__fixtures__/output2/tendermint/abci/types.ts @@ -439,12 +439,9 @@ export interface TxResult { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: Long; } /** ValidatorUpdate */ diff --git a/__fixtures__/output2/tendermint/types/types.ts b/__fixtures__/output2/tendermint/types/types.ts index d8f0e076d4..2a10ac2e9c 100644 --- a/__fixtures__/output2/tendermint/types/types.ts +++ b/__fixtures__/output2/tendermint/types/types.ts @@ -122,6 +122,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -131,6 +132,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array; diff --git a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts index fc0c0b03f7..4da13560db 100644 --- a/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/cosmwasm/wasm/v1/query.ts @@ -93,11 +93,9 @@ export interface QueryContractHistoryResponseSDKType { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: bigint; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } export interface QueryContractsByCodeRequestProtoMsg { diff --git a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts index 64ef312609..1a4a62caa4 100644 --- a/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputinstantrpc/evmos/incentives/v1/query.ts @@ -141,10 +141,6 @@ export interface QueryGasMeterRequestSDKType { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: bigint; } export interface QueryGasMeterResponseProtoMsg { diff --git a/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts index 2b031bc680..559be1ac6f 100644 --- a/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputinstantrpc/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -376,6 +374,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts index 2eb48468c5..d42a95732d 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/lock.ts @@ -53,7 +53,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: bigint; + iD: bigint; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -175,7 +175,7 @@ export interface SyntheticLockSDKType { } function createBasePeriodLock(): PeriodLock { return { - ID: BigInt(0), + iD: BigInt(0), owner: "", duration: Duration.fromPartial({}), endTime: new Date(), @@ -185,8 +185,8 @@ function createBasePeriodLock(): PeriodLock { export const PeriodLock = { typeUrl: "/osmosis.lockup.PeriodLock", encode(message: PeriodLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== undefined) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== undefined) { writer.uint32(18).string(message.owner); @@ -210,7 +210,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 2: message.owner = reader.string(); @@ -233,7 +233,7 @@ export const PeriodLock = { }, fromJSON(object: any): PeriodLock { const obj = createBasePeriodLock(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.owner)) obj.owner = String(object.owner); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); if (isSet(object.endTime)) obj.endTime = new Date(object.endTime); @@ -242,7 +242,7 @@ export const PeriodLock = { }, toJSON(message: PeriodLock): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.owner !== undefined && (obj.owner = message.owner); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); message.endTime !== undefined && (obj.endTime = message.endTime.toISOString()); @@ -255,8 +255,8 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.owner = object.owner ?? ""; if (object.duration !== undefined && object.duration !== null) { @@ -268,7 +268,7 @@ export const PeriodLock = { }, fromSDK(object: PeriodLockSDKType): PeriodLock { return { - ID: object?.ID, + iD: object?.ID, owner: object?.owner, duration: object.duration ? Duration.fromSDK(object.duration) : undefined, endTime: object.end_time ?? undefined, @@ -286,7 +286,7 @@ export const PeriodLock = { }, toSDK(message: PeriodLock): PeriodLockSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); message.endTime !== undefined && (obj.end_time = message.endTime ?? undefined); @@ -300,7 +300,7 @@ export const PeriodLock = { fromAmino(object: PeriodLockAmino): PeriodLock { const message = createBasePeriodLock(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.owner !== undefined && object.owner !== null) { message.owner = object.owner; @@ -316,7 +316,7 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts index 33e2ea5c7a..ffd9867d50 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.amino.ts @@ -114,12 +114,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/begin-unlock-period-lock", toAmino: ({ owner, - ID, + iD, coins }: MsgBeginUnlocking): MsgBeginUnlockingAminoType["value"] => { return { owner, - ID: omitDefault(ID)?.toString?.(), + ID: omitDefault(iD)?.toString?.(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -133,7 +133,7 @@ export const AminoConverter = { }: MsgBeginUnlockingAminoType["value"]): MsgBeginUnlocking => { return { owner, - ID: ID == null ? ID : BigInt(ID), + iD: ID == null ? ID : BigInt(ID), coins: coins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount @@ -145,12 +145,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/extend-lockup", toAmino: ({ owner, - ID, + iD, duration }: MsgExtendLockup): MsgExtendLockupAminoType["value"] => { return { owner, - ID: omitDefault(ID)?.toString?.(), + ID: omitDefault(iD)?.toString?.(), duration: (duration * 1_000_000_000).toString() }; }, @@ -161,7 +161,7 @@ export const AminoConverter = { }: MsgExtendLockupAminoType["value"]): MsgExtendLockup => { return { owner, - ID: ID == null ? ID : BigInt(ID), + iD: ID == null ? ID : BigInt(ID), duration: duration == null ? duration : { seconds: BigInt(Math.floor(parseInt(duration) / 1_000_000_000)), nanos: parseInt(duration) % 1_000_000_000 @@ -173,12 +173,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/force-unlock", toAmino: ({ owner, - ID, + iD, coins }: MsgForceUnlock): MsgForceUnlockAminoType["value"] => { return { owner, - ID: omitDefault(ID)?.toString?.(), + ID: omitDefault(iD)?.toString?.(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -192,7 +192,7 @@ export const AminoConverter = { }: MsgForceUnlockAminoType["value"]): MsgForceUnlock => { return { owner, - ID: ID == null ? ID : BigInt(ID), + iD: ID == null ? ID : BigInt(ID), coins: coins.map?.(el0 => ({ denom: el0.denom, amount: el0.amount diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts index a4aced25e6..a4ced652ea 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/lockup/tx.ts @@ -20,7 +20,7 @@ export interface MsgLockTokensSDKType { coins: CoinSDKType[]; } export interface MsgLockTokensResponse { - ID: bigint; + iD: bigint; } export interface MsgLockTokensResponseProtoMsg { typeUrl: "/osmosis.lockup.MsgLockTokensResponse"; @@ -51,7 +51,7 @@ export interface MsgBeginUnlockingAllResponseSDKType { } export interface MsgBeginUnlocking { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -80,7 +80,7 @@ export interface MsgBeginUnlockingResponseSDKType { */ export interface MsgExtendLockup { owner: string; - ID: bigint; + iD: bigint; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -116,7 +116,7 @@ export interface MsgExtendLockupResponseSDKType { */ export interface MsgForceUnlock { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -285,14 +285,14 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockTokensResponse = { typeUrl: "/osmosis.lockup.MsgLockTokensResponse", encode(message: MsgLockTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== undefined) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -304,7 +304,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -315,24 +315,24 @@ export const MsgLockTokensResponse = { }, fromJSON(object: any): MsgLockTokensResponse { const obj = createBaseMsgLockTokensResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, toJSON(message: MsgLockTokensResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockTokensResponseSDKType): MsgLockTokensResponse { return { - ID: object?.ID + iD: object?.ID }; }, fromSDKJSON(object: any): MsgLockTokensResponseSDKType { @@ -342,19 +342,19 @@ export const MsgLockTokensResponse = { }, toSDK(message: MsgLockTokensResponse): MsgLockTokensResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockTokensResponseAmino): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -580,7 +580,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -590,8 +590,8 @@ export const MsgBeginUnlocking = { if (message.owner !== undefined) { writer.uint32(10).string(message.owner); } - if (message.ID !== undefined) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -609,7 +609,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -624,14 +624,14 @@ export const MsgBeginUnlocking = { fromJSON(object: any): MsgBeginUnlocking { const obj = createBaseMsgBeginUnlocking(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, toJSON(message: MsgBeginUnlocking): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -642,8 +642,8 @@ export const MsgBeginUnlocking = { fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -651,7 +651,7 @@ export const MsgBeginUnlocking = { fromSDK(object: MsgBeginUnlockingSDKType): MsgBeginUnlocking { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, @@ -665,7 +665,7 @@ export const MsgBeginUnlocking = { toSDK(message: MsgBeginUnlocking): MsgBeginUnlockingSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -679,7 +679,7 @@ export const MsgBeginUnlocking = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -687,7 +687,7 @@ export const MsgBeginUnlocking = { toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { @@ -814,7 +814,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), duration: Duration.fromPartial({}) }; } @@ -824,8 +824,8 @@ export const MsgExtendLockup = { if (message.owner !== undefined) { writer.uint32(10).string(message.owner); } - if (message.ID !== undefined) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -843,7 +843,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.duration = Duration.decode(reader, reader.uint32()); @@ -858,22 +858,22 @@ export const MsgExtendLockup = { fromJSON(object: any): MsgExtendLockup { const obj = createBaseMsgExtendLockup(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); return obj; }, toJSON(message: MsgExtendLockup): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); return obj; }, fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromPartial(object.duration); @@ -883,7 +883,7 @@ export const MsgExtendLockup = { fromSDK(object: MsgExtendLockupSDKType): MsgExtendLockup { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, duration: object.duration ? Duration.fromSDK(object.duration) : undefined }; }, @@ -897,7 +897,7 @@ export const MsgExtendLockup = { toSDK(message: MsgExtendLockup): MsgExtendLockupSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; }, @@ -907,7 +907,7 @@ export const MsgExtendLockup = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromAmino(object.duration); @@ -917,7 +917,7 @@ export const MsgExtendLockup = { toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1040,7 +1040,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -1050,8 +1050,8 @@ export const MsgForceUnlock = { if (message.owner !== undefined) { writer.uint32(10).string(message.owner); } - if (message.ID !== undefined) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -1069,7 +1069,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -1084,14 +1084,14 @@ export const MsgForceUnlock = { fromJSON(object: any): MsgForceUnlock { const obj = createBaseMsgForceUnlock(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, toJSON(message: MsgForceUnlock): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -1102,8 +1102,8 @@ export const MsgForceUnlock = { fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -1111,7 +1111,7 @@ export const MsgForceUnlock = { fromSDK(object: MsgForceUnlockSDKType): MsgForceUnlock { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, @@ -1125,7 +1125,7 @@ export const MsgForceUnlock = { toSDK(message: MsgForceUnlock): MsgForceUnlockSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -1139,7 +1139,7 @@ export const MsgForceUnlock = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -1147,7 +1147,7 @@ export const MsgForceUnlock = { toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { diff --git a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts index fcc6f29517..fac17b0791 100644 --- a/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputinstantrpc/osmosis/superfluid/tx.ts @@ -84,7 +84,7 @@ export interface MsgLockAndSuperfluidDelegateSDKType { val_addr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: bigint; + iD: bigint; } export interface MsgLockAndSuperfluidDelegateResponseProtoMsg { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse"; @@ -853,14 +853,14 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockAndSuperfluidDelegateResponse = { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse", encode(message: MsgLockAndSuperfluidDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== undefined) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -872,7 +872,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -883,24 +883,24 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromJSON(object: any): MsgLockAndSuperfluidDelegateResponse { const obj = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, toJSON(message: MsgLockAndSuperfluidDelegateResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockAndSuperfluidDelegateResponseSDKType): MsgLockAndSuperfluidDelegateResponse { return { - ID: object?.ID + iD: object?.ID }; }, fromSDKJSON(object: any): MsgLockAndSuperfluidDelegateResponseSDKType { @@ -910,19 +910,19 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toSDK(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockAndSuperfluidDelegateResponseAmino): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts index 451eb0f4e8..a8391dc81a 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/abci/types.ts @@ -824,12 +824,9 @@ export interface TxResultSDKType { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: bigint; } export interface ValidatorProtoMsg { diff --git a/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts b/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts index 230075d7ba..4d20542e89 100644 --- a/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputinstantrpc/tendermint/types/types.ts @@ -149,6 +149,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -158,6 +159,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array; diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts index 5e3bc40bc3..533fd3ab2b 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts @@ -93,11 +93,9 @@ export interface QueryContractHistoryResponseSDKType { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: bigint; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } export interface QueryContractsByCodeRequestProtoMsg { diff --git a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts index 6e36b2179b..2d2e8e2e75 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts @@ -141,10 +141,6 @@ export interface QueryGasMeterRequestSDKType { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: bigint; } export interface QueryGasMeterResponseProtoMsg { diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts index d9f9f45ab2..48273319b6 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -376,6 +374,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts index 3aae5b5023..745dae40db 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts @@ -53,7 +53,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: bigint; + iD: bigint; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -175,7 +175,7 @@ export interface SyntheticLockSDKType { } function createBasePeriodLock(): PeriodLock { return { - ID: BigInt(0), + iD: BigInt(0), owner: "", duration: Duration.fromPartial({}), endTime: new Date(), @@ -185,8 +185,8 @@ function createBasePeriodLock(): PeriodLock { export const PeriodLock = { typeUrl: "/osmosis.lockup.PeriodLock", encode(message: PeriodLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== "") { writer.uint32(18).string(message.owner); @@ -210,7 +210,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 2: message.owner = reader.string(); @@ -233,7 +233,7 @@ export const PeriodLock = { }, fromJSON(object: any): PeriodLock { return { - ID: isSet(object.ID) ? BigInt(object.ID.toString()) : BigInt(0), + iD: isSet(object.iD) ? BigInt(object.iD.toString()) : BigInt(0), owner: isSet(object.owner) ? String(object.owner) : "", duration: isSet(object.duration) ? Duration.fromJSON(object.duration) : undefined, endTime: isSet(object.endTime) ? new Date(object.endTime) : undefined, @@ -242,7 +242,7 @@ export const PeriodLock = { }, toJSON(message: PeriodLock): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.owner !== undefined && (obj.owner = message.owner); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); message.endTime !== undefined && (obj.endTime = message.endTime.toISOString()); @@ -255,7 +255,7 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - message.ID = object.ID !== undefined && object.ID !== null ? BigInt(object.ID.toString()) : BigInt(0); + message.iD = object.iD !== undefined && object.iD !== null ? BigInt(object.iD.toString()) : BigInt(0); message.owner = object.owner ?? ""; message.duration = object.duration !== undefined && object.duration !== null ? Duration.fromPartial(object.duration) : undefined; message.endTime = object.endTime ?? undefined; @@ -264,7 +264,7 @@ export const PeriodLock = { }, fromSDK(object: PeriodLockSDKType): PeriodLock { return { - ID: object?.ID, + iD: object?.ID, owner: object?.owner, duration: object.duration ? Duration.fromSDK(object.duration) : undefined, endTime: object.end_time ?? undefined, @@ -282,7 +282,7 @@ export const PeriodLock = { }, toSDK(message: PeriodLock): PeriodLockSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); message.endTime !== undefined && (obj.end_time = message.endTime ?? undefined); @@ -296,7 +296,7 @@ export const PeriodLock = { fromAmino(object: PeriodLockAmino): PeriodLock { const message = createBasePeriodLock(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.owner !== undefined && object.owner !== null) { message.owner = object.owner; @@ -312,7 +312,7 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.amino.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.amino.ts index 5a645daaa7..970624a329 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.amino.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.amino.ts @@ -113,12 +113,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/begin-unlock-period-lock", toAmino: ({ owner, - ID, + iD, coins }: MsgBeginUnlocking): MsgBeginUnlockingAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -132,7 +132,7 @@ export const AminoConverter = { }: MsgBeginUnlockingAminoType["value"]): MsgBeginUnlocking => { return { owner, - ID: BigInt(ID), + iD: BigInt(ID), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -144,12 +144,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/extend-lockup", toAmino: ({ owner, - ID, + iD, duration }: MsgExtendLockup): MsgExtendLockupAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), duration: (duration * 1_000_000_000).toString() }; }, @@ -160,7 +160,7 @@ export const AminoConverter = { }: MsgExtendLockupAminoType["value"]): MsgExtendLockup => { return { owner, - ID: BigInt(ID), + iD: BigInt(ID), duration: { seconds: BigInt(Math.floor(parseInt(duration) / 1_000_000_000)), nanos: parseInt(duration) % 1_000_000_000 @@ -172,12 +172,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/force-unlock", toAmino: ({ owner, - ID, + iD, coins }: MsgForceUnlock): MsgForceUnlockAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -191,7 +191,7 @@ export const AminoConverter = { }: MsgForceUnlockAminoType["value"]): MsgForceUnlock => { return { owner, - ID: BigInt(ID), + iD: BigInt(ID), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts index 478f4d044e..97b6583862 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts @@ -20,7 +20,7 @@ export interface MsgLockTokensSDKType { coins: CoinSDKType[]; } export interface MsgLockTokensResponse { - ID: bigint; + iD: bigint; } export interface MsgLockTokensResponseProtoMsg { typeUrl: "/osmosis.lockup.MsgLockTokensResponse"; @@ -51,7 +51,7 @@ export interface MsgBeginUnlockingAllResponseSDKType { } export interface MsgBeginUnlocking { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -80,7 +80,7 @@ export interface MsgBeginUnlockingResponseSDKType { */ export interface MsgExtendLockup { owner: string; - ID: bigint; + iD: bigint; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -116,7 +116,7 @@ export interface MsgExtendLockupResponseSDKType { */ export interface MsgForceUnlock { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -283,14 +283,14 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockTokensResponse = { typeUrl: "/osmosis.lockup.MsgLockTokensResponse", encode(message: MsgLockTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -302,7 +302,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -313,22 +313,22 @@ export const MsgLockTokensResponse = { }, fromJSON(object: any): MsgLockTokensResponse { return { - ID: isSet(object.ID) ? BigInt(object.ID.toString()) : BigInt(0) + iD: isSet(object.iD) ? BigInt(object.iD.toString()) : BigInt(0) }; }, toJSON(message: MsgLockTokensResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - message.ID = object.ID !== undefined && object.ID !== null ? BigInt(object.ID.toString()) : BigInt(0); + message.iD = object.iD !== undefined && object.iD !== null ? BigInt(object.iD.toString()) : BigInt(0); return message; }, fromSDK(object: MsgLockTokensResponseSDKType): MsgLockTokensResponse { return { - ID: object?.ID + iD: object?.ID }; }, fromSDKJSON(object: any): MsgLockTokensResponseSDKType { @@ -338,19 +338,19 @@ export const MsgLockTokensResponse = { }, toSDK(message: MsgLockTokensResponse): MsgLockTokensResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockTokensResponseAmino): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -576,7 +576,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -586,8 +586,8 @@ export const MsgBeginUnlocking = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -605,7 +605,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -620,14 +620,14 @@ export const MsgBeginUnlocking = { fromJSON(object: any): MsgBeginUnlocking { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? BigInt(object.ID.toString()) : BigInt(0), + iD: isSet(object.iD) ? BigInt(object.iD.toString()) : BigInt(0), coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] }; }, toJSON(message: MsgBeginUnlocking): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -638,14 +638,14 @@ export const MsgBeginUnlocking = { fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? BigInt(object.ID.toString()) : BigInt(0); + message.iD = object.iD !== undefined && object.iD !== null ? BigInt(object.iD.toString()) : BigInt(0); message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; }, fromSDK(object: MsgBeginUnlockingSDKType): MsgBeginUnlocking { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, @@ -659,7 +659,7 @@ export const MsgBeginUnlocking = { toSDK(message: MsgBeginUnlocking): MsgBeginUnlockingSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -673,7 +673,7 @@ export const MsgBeginUnlocking = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -681,7 +681,7 @@ export const MsgBeginUnlocking = { toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { @@ -808,7 +808,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), duration: Duration.fromPartial({}) }; } @@ -818,8 +818,8 @@ export const MsgExtendLockup = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -837,7 +837,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.duration = Duration.decode(reader, reader.uint32()); @@ -852,28 +852,28 @@ export const MsgExtendLockup = { fromJSON(object: any): MsgExtendLockup { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? BigInt(object.ID.toString()) : BigInt(0), + iD: isSet(object.iD) ? BigInt(object.iD.toString()) : BigInt(0), duration: isSet(object.duration) ? Duration.fromJSON(object.duration) : undefined }; }, toJSON(message: MsgExtendLockup): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); return obj; }, fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? BigInt(object.ID.toString()) : BigInt(0); + message.iD = object.iD !== undefined && object.iD !== null ? BigInt(object.iD.toString()) : BigInt(0); message.duration = object.duration !== undefined && object.duration !== null ? Duration.fromPartial(object.duration) : undefined; return message; }, fromSDK(object: MsgExtendLockupSDKType): MsgExtendLockup { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, duration: object.duration ? Duration.fromSDK(object.duration) : undefined }; }, @@ -887,7 +887,7 @@ export const MsgExtendLockup = { toSDK(message: MsgExtendLockup): MsgExtendLockupSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; }, @@ -897,7 +897,7 @@ export const MsgExtendLockup = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromAmino(object.duration); @@ -907,7 +907,7 @@ export const MsgExtendLockup = { toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1030,7 +1030,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -1040,8 +1040,8 @@ export const MsgForceUnlock = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -1059,7 +1059,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -1074,14 +1074,14 @@ export const MsgForceUnlock = { fromJSON(object: any): MsgForceUnlock { return { owner: isSet(object.owner) ? String(object.owner) : "", - ID: isSet(object.ID) ? BigInt(object.ID.toString()) : BigInt(0), + iD: isSet(object.iD) ? BigInt(object.iD.toString()) : BigInt(0), coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] }; }, toJSON(message: MsgForceUnlock): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -1092,14 +1092,14 @@ export const MsgForceUnlock = { fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - message.ID = object.ID !== undefined && object.ID !== null ? BigInt(object.ID.toString()) : BigInt(0); + message.iD = object.iD !== undefined && object.iD !== null ? BigInt(object.iD.toString()) : BigInt(0); message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; }, fromSDK(object: MsgForceUnlockSDKType): MsgForceUnlock { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, @@ -1113,7 +1113,7 @@ export const MsgForceUnlock = { toSDK(message: MsgForceUnlock): MsgForceUnlockSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -1127,7 +1127,7 @@ export const MsgForceUnlock = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -1135,7 +1135,7 @@ export const MsgForceUnlock = { toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts index 9b8eea1e1b..4ecb029bef 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts @@ -84,7 +84,7 @@ export interface MsgLockAndSuperfluidDelegateSDKType { val_addr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: bigint; + iD: bigint; } export interface MsgLockAndSuperfluidDelegateResponseProtoMsg { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse"; @@ -844,14 +844,14 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockAndSuperfluidDelegateResponse = { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse", encode(message: MsgLockAndSuperfluidDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -863,7 +863,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -874,22 +874,22 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromJSON(object: any): MsgLockAndSuperfluidDelegateResponse { return { - ID: isSet(object.ID) ? BigInt(object.ID.toString()) : BigInt(0) + iD: isSet(object.iD) ? BigInt(object.iD.toString()) : BigInt(0) }; }, toJSON(message: MsgLockAndSuperfluidDelegateResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - message.ID = object.ID !== undefined && object.ID !== null ? BigInt(object.ID.toString()) : BigInt(0); + message.iD = object.iD !== undefined && object.iD !== null ? BigInt(object.iD.toString()) : BigInt(0); return message; }, fromSDK(object: MsgLockAndSuperfluidDelegateResponseSDKType): MsgLockAndSuperfluidDelegateResponse { return { - ID: object?.ID + iD: object?.ID }; }, fromSDKJSON(object: any): MsgLockAndSuperfluidDelegateResponseSDKType { @@ -899,19 +899,19 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toSDK(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockAndSuperfluidDelegateResponseAmino): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { diff --git a/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts index 935945e98d..cc97f1137b 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts @@ -824,12 +824,9 @@ export interface TxResultSDKType { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: bigint; } export interface ValidatorProtoMsg { diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts index 8137adfc45..601dcd558c 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts @@ -149,6 +149,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -158,6 +159,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array; diff --git a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts index 15cbc1a709..a2197edd73 100644 --- a/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputsign/cosmwasm/wasm/v1/query.ts @@ -144,11 +144,9 @@ export interface QueryContractHistoryResponseSDKType { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: bigint; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } export interface QueryContractsByCodeRequestProtoMsg { @@ -160,11 +158,9 @@ export interface QueryContractsByCodeRequestProtoMsg { * RPC method */ export interface QueryContractsByCodeRequestAmino { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ code_id?: string; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequestAmino; } export interface QueryContractsByCodeRequestAminoMsg { diff --git a/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts index 094855e1e0..4f00213544 100644 --- a/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputsign/evmos/incentives/v1/query.ts @@ -223,10 +223,6 @@ export interface QueryGasMeterRequestSDKType { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: bigint; } export interface QueryGasMeterResponseProtoMsg { @@ -238,10 +234,6 @@ export interface QueryGasMeterResponseProtoMsg { * method. */ export interface QueryGasMeterResponseAmino { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gas_meter?: string; } export interface QueryGasMeterResponseAminoMsg { diff --git a/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts index 5975d23774..503eaeee3c 100644 --- a/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputsign/google/protobuf/descriptor.ts @@ -30,6 +30,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -191,12 +192,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -392,6 +390,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -429,6 +428,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts index afeca4035c..3a1223823e 100644 --- a/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputsign/osmosis/lockup/lock.ts @@ -53,7 +53,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: bigint; + iD: bigint; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -271,7 +271,7 @@ export interface SyntheticLockSDKType { } function createBasePeriodLock(): PeriodLock { return { - ID: BigInt(0), + iD: BigInt(0), owner: "", duration: Duration.fromPartial({}), endTime: new Date(), @@ -281,8 +281,8 @@ function createBasePeriodLock(): PeriodLock { export const PeriodLock = { typeUrl: "/osmosis.lockup.PeriodLock", encode(message: PeriodLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== "") { writer.uint32(18).string(message.owner); @@ -306,7 +306,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 2: message.owner = reader.string(); @@ -329,8 +329,8 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.owner = object.owner ?? ""; if (object.duration !== undefined && object.duration !== null) { @@ -343,7 +343,7 @@ export const PeriodLock = { fromAmino(object: PeriodLockAmino): PeriodLock { const message = createBasePeriodLock(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.owner !== undefined && object.owner !== null) { message.owner = object.owner; @@ -359,7 +359,7 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; diff --git a/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts index 0a462f85e5..61fb5b51fd 100644 --- a/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/lockup/tx.ts @@ -28,7 +28,7 @@ export interface MsgLockTokensSDKType { coins: CoinSDKType[]; } export interface MsgLockTokensResponse { - ID: bigint; + iD: bigint; } export interface MsgLockTokensResponseProtoMsg { typeUrl: "/osmosis.lockup.MsgLockTokensResponse"; @@ -80,7 +80,7 @@ export interface MsgBeginUnlockingAllResponseSDKType { } export interface MsgBeginUnlocking { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -126,7 +126,7 @@ export interface MsgBeginUnlockingResponseSDKType { */ export interface MsgExtendLockup { owner: string; - ID: bigint; + iD: bigint; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -186,7 +186,7 @@ export interface MsgExtendLockupResponseSDKType { */ export interface MsgForceUnlock { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -333,14 +333,14 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockTokensResponse = { typeUrl: "/osmosis.lockup.MsgLockTokensResponse", encode(message: MsgLockTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -352,7 +352,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -363,21 +363,21 @@ export const MsgLockTokensResponse = { }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromAmino(object: MsgLockTokensResponseAmino): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -545,7 +545,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -555,8 +555,8 @@ export const MsgBeginUnlocking = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -574,7 +574,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -589,8 +589,8 @@ export const MsgBeginUnlocking = { fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -601,7 +601,7 @@ export const MsgBeginUnlocking = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -609,7 +609,7 @@ export const MsgBeginUnlocking = { toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { @@ -711,7 +711,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), duration: Duration.fromPartial({}) }; } @@ -721,8 +721,8 @@ export const MsgExtendLockup = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -740,7 +740,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.duration = Duration.decode(reader, reader.uint32()); @@ -755,8 +755,8 @@ export const MsgExtendLockup = { fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromPartial(object.duration); @@ -769,7 +769,7 @@ export const MsgExtendLockup = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromAmino(object.duration); @@ -779,7 +779,7 @@ export const MsgExtendLockup = { toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -877,7 +877,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -887,8 +887,8 @@ export const MsgForceUnlock = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -906,7 +906,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -921,8 +921,8 @@ export const MsgForceUnlock = { fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -933,7 +933,7 @@ export const MsgForceUnlock = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -941,7 +941,7 @@ export const MsgForceUnlock = { toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { diff --git a/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts index f9828750d2..512fc0631a 100644 --- a/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputsign/osmosis/superfluid/tx.ts @@ -137,7 +137,7 @@ export interface MsgLockAndSuperfluidDelegateSDKType { val_addr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: bigint; + iD: bigint; } export interface MsgLockAndSuperfluidDelegateResponseProtoMsg { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse"; @@ -746,14 +746,14 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockAndSuperfluidDelegateResponse = { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse", encode(message: MsgLockAndSuperfluidDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -765,7 +765,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -776,21 +776,21 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromAmino(object: MsgLockAndSuperfluidDelegateResponseAmino): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { diff --git a/__fixtures__/v-next/outputsign/tendermint/abci/types.ts b/__fixtures__/v-next/outputsign/tendermint/abci/types.ts index 91b8a1b8e2..812983e5e2 100644 --- a/__fixtures__/v-next/outputsign/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputsign/tendermint/abci/types.ts @@ -1225,12 +1225,9 @@ export interface TxResultSDKType { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: bigint; } export interface ValidatorProtoMsg { @@ -1239,12 +1236,9 @@ export interface ValidatorProtoMsg { } /** Validator */ export interface ValidatorAmino { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address?: string; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power?: string; } export interface ValidatorAminoMsg { diff --git a/__fixtures__/v-next/outputsign/tendermint/types/types.ts b/__fixtures__/v-next/outputsign/tendermint/types/types.ts index bf695a7392..b26b9c1a4e 100644 --- a/__fixtures__/v-next/outputsign/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputsign/tendermint/types/types.ts @@ -177,6 +177,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -186,6 +187,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array; @@ -207,6 +209,7 @@ export interface HeaderAmino { last_block_id?: BlockIDAmino; /** hashes of block data */ last_commit_hash?: string; + /** transactions */ data_hash?: string; /** hashes from the app output from the prev block */ validators_hash?: string; @@ -216,6 +219,7 @@ export interface HeaderAmino { consensus_hash?: string; /** state after txs from the previous block */ app_hash?: string; + /** root hash of all results from the txs from the previous block */ last_results_hash?: string; /** consensus info */ evidence_hash?: string; diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts index 627f454828..769ed652e7 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts @@ -145,11 +145,9 @@ export interface QueryContractHistoryResponseSDKType { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: bigint; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } export interface QueryContractsByCodeRequestProtoMsg { @@ -161,11 +159,9 @@ export interface QueryContractsByCodeRequestProtoMsg { * RPC method */ export interface QueryContractsByCodeRequestAmino { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ code_id?: string; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequestAmino; } export interface QueryContractsByCodeRequestAminoMsg { diff --git a/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts index e058918272..c05dad4101 100644 --- a/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts @@ -224,10 +224,6 @@ export interface QueryGasMeterRequestSDKType { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: bigint; } export interface QueryGasMeterResponseProtoMsg { @@ -239,10 +235,6 @@ export interface QueryGasMeterResponseProtoMsg { * method. */ export interface QueryGasMeterResponseAmino { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gas_meter?: string; } export interface QueryGasMeterResponseAminoMsg { diff --git a/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts index 49108d8838..bdcc584e91 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -192,12 +193,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -393,6 +391,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -430,6 +429,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts index 7d69c357db..2eb8ca1d0f 100644 --- a/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputv2/osmosis/lockup/lock.ts @@ -54,7 +54,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: bigint; + iD: bigint; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -272,7 +272,7 @@ export interface SyntheticLockSDKType { } function createBasePeriodLock(): PeriodLock { return { - ID: BigInt(0), + iD: BigInt(0), owner: "", duration: Duration.fromPartial({}), endTime: new Date(), @@ -283,8 +283,8 @@ export const PeriodLock = { typeUrl: "/osmosis.lockup.PeriodLock", aminoType: "osmosis/lockup/period-lock", encode(message: PeriodLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== "") { writer.uint32(18).string(message.owner); @@ -308,7 +308,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 2: message.owner = reader.string(); @@ -331,7 +331,7 @@ export const PeriodLock = { }, fromJSON(object: any): PeriodLock { const obj = createBasePeriodLock(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.owner)) obj.owner = String(object.owner); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); if (isSet(object.endTime)) obj.endTime = new Date(object.endTime); @@ -340,7 +340,7 @@ export const PeriodLock = { }, toJSON(message: PeriodLock): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.owner !== undefined && (obj.owner = message.owner); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); message.endTime !== undefined && (obj.endTime = message.endTime.toISOString()); @@ -353,8 +353,8 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.owner = object.owner ?? ""; if (object.duration !== undefined && object.duration !== null) { @@ -366,7 +366,7 @@ export const PeriodLock = { }, fromSDK(object: PeriodLockSDKType): PeriodLock { return { - ID: object?.ID, + iD: object?.ID, owner: object?.owner, duration: object.duration ? Duration.fromSDK(object.duration) : undefined, endTime: object.end_time ?? undefined, @@ -375,7 +375,7 @@ export const PeriodLock = { }, toSDK(message: PeriodLock): PeriodLockSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); message.endTime !== undefined && (obj.end_time = message.endTime ?? undefined); @@ -389,7 +389,7 @@ export const PeriodLock = { fromAmino(object: PeriodLockAmino): PeriodLock { const message = createBasePeriodLock(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.owner !== undefined && object.owner !== null) { message.owner = object.owner; @@ -405,7 +405,7 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; diff --git a/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts index 9a3341de16..98a4086ae4 100644 --- a/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/lockup/tx.ts @@ -29,7 +29,7 @@ export interface MsgLockTokensSDKType { coins: CoinSDKType[]; } export interface MsgLockTokensResponse { - ID: bigint; + iD: bigint; } export interface MsgLockTokensResponseProtoMsg { typeUrl: "/osmosis.lockup.MsgLockTokensResponse"; @@ -81,7 +81,7 @@ export interface MsgBeginUnlockingAllResponseSDKType { } export interface MsgBeginUnlocking { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -127,7 +127,7 @@ export interface MsgBeginUnlockingResponseSDKType { */ export interface MsgExtendLockup { owner: string; - ID: bigint; + iD: bigint; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -187,7 +187,7 @@ export interface MsgExtendLockupResponseSDKType { */ export interface MsgForceUnlock { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -371,15 +371,15 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockTokensResponse = { typeUrl: "/osmosis.lockup.MsgLockTokensResponse", aminoType: "osmosis/lockup/lock-tokens-response", encode(message: MsgLockTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -391,7 +391,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -402,41 +402,41 @@ export const MsgLockTokensResponse = { }, fromJSON(object: any): MsgLockTokensResponse { const obj = createBaseMsgLockTokensResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, toJSON(message: MsgLockTokensResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockTokensResponseSDKType): MsgLockTokensResponse { return { - ID: object?.ID + iD: object?.ID }; }, toSDK(message: MsgLockTokensResponse): MsgLockTokensResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockTokensResponseAmino): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -654,7 +654,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -665,8 +665,8 @@ export const MsgBeginUnlocking = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -684,7 +684,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -699,14 +699,14 @@ export const MsgBeginUnlocking = { fromJSON(object: any): MsgBeginUnlocking { const obj = createBaseMsgBeginUnlocking(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, toJSON(message: MsgBeginUnlocking): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -717,8 +717,8 @@ export const MsgBeginUnlocking = { fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -726,14 +726,14 @@ export const MsgBeginUnlocking = { fromSDK(object: MsgBeginUnlockingSDKType): MsgBeginUnlocking { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, toSDK(message: MsgBeginUnlocking): MsgBeginUnlockingSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -747,7 +747,7 @@ export const MsgBeginUnlocking = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -755,7 +755,7 @@ export const MsgBeginUnlocking = { toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { @@ -878,7 +878,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), duration: Duration.fromPartial({}) }; } @@ -889,8 +889,8 @@ export const MsgExtendLockup = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -908,7 +908,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.duration = Duration.decode(reader, reader.uint32()); @@ -923,22 +923,22 @@ export const MsgExtendLockup = { fromJSON(object: any): MsgExtendLockup { const obj = createBaseMsgExtendLockup(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); return obj; }, toJSON(message: MsgExtendLockup): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); return obj; }, fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromPartial(object.duration); @@ -948,14 +948,14 @@ export const MsgExtendLockup = { fromSDK(object: MsgExtendLockupSDKType): MsgExtendLockup { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, duration: object.duration ? Duration.fromSDK(object.duration) : undefined }; }, toSDK(message: MsgExtendLockup): MsgExtendLockupSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; }, @@ -965,7 +965,7 @@ export const MsgExtendLockup = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromAmino(object.duration); @@ -975,7 +975,7 @@ export const MsgExtendLockup = { toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1094,7 +1094,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -1105,8 +1105,8 @@ export const MsgForceUnlock = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -1124,7 +1124,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -1139,14 +1139,14 @@ export const MsgForceUnlock = { fromJSON(object: any): MsgForceUnlock { const obj = createBaseMsgForceUnlock(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, toJSON(message: MsgForceUnlock): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -1157,8 +1157,8 @@ export const MsgForceUnlock = { fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -1166,14 +1166,14 @@ export const MsgForceUnlock = { fromSDK(object: MsgForceUnlockSDKType): MsgForceUnlock { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, toSDK(message: MsgForceUnlock): MsgForceUnlockSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -1187,7 +1187,7 @@ export const MsgForceUnlock = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -1195,7 +1195,7 @@ export const MsgForceUnlock = { toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { diff --git a/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts index 859fc8e3de..b314ed36f3 100644 --- a/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputv2/osmosis/superfluid/tx.ts @@ -138,7 +138,7 @@ export interface MsgLockAndSuperfluidDelegateSDKType { val_addr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: bigint; + iD: bigint; } export interface MsgLockAndSuperfluidDelegateResponseProtoMsg { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse"; @@ -911,15 +911,15 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockAndSuperfluidDelegateResponse = { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse", aminoType: "osmosis/lock-and-superfluid-delegate-response", encode(message: MsgLockAndSuperfluidDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -931,7 +931,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -942,41 +942,41 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromJSON(object: any): MsgLockAndSuperfluidDelegateResponse { const obj = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, toJSON(message: MsgLockAndSuperfluidDelegateResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockAndSuperfluidDelegateResponseSDKType): MsgLockAndSuperfluidDelegateResponse { return { - ID: object?.ID + iD: object?.ID }; }, toSDK(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockAndSuperfluidDelegateResponseAmino): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { diff --git a/__fixtures__/v-next/outputv2/tendermint/abci/types.ts b/__fixtures__/v-next/outputv2/tendermint/abci/types.ts index 810a212d25..a54092c3f4 100644 --- a/__fixtures__/v-next/outputv2/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputv2/tendermint/abci/types.ts @@ -1226,12 +1226,9 @@ export interface TxResultSDKType { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: bigint; } export interface ValidatorProtoMsg { @@ -1240,12 +1237,9 @@ export interface ValidatorProtoMsg { } /** Validator */ export interface ValidatorAmino { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address?: string; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power?: string; } export interface ValidatorAminoMsg { diff --git a/__fixtures__/v-next/outputv2/tendermint/types/types.ts b/__fixtures__/v-next/outputv2/tendermint/types/types.ts index 79fa35759d..485dfa701e 100644 --- a/__fixtures__/v-next/outputv2/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputv2/tendermint/types/types.ts @@ -178,6 +178,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -187,6 +188,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array; @@ -208,6 +210,7 @@ export interface HeaderAmino { last_block_id?: BlockIDAmino; /** hashes of block data */ last_commit_hash?: string; + /** transactions */ data_hash?: string; /** hashes from the app output from the prev block */ validators_hash?: string; @@ -217,6 +220,7 @@ export interface HeaderAmino { consensus_hash?: string; /** state after txs from the previous block */ app_hash?: string; + /** root hash of all results from the txs from the previous block */ last_results_hash?: string; /** consensus info */ evidence_hash?: string; diff --git a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts index 502e8fbfc4..489130419d 100644 --- a/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputv3/cosmwasm/wasm/v1/query.ts @@ -128,11 +128,9 @@ export interface QueryContractHistoryResponseSDKType { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: bigint; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } export interface QueryContractsByCodeRequestProtoMsg { @@ -144,11 +142,9 @@ export interface QueryContractsByCodeRequestProtoMsg { * RPC method */ export interface QueryContractsByCodeRequestAmino { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ code_id?: string; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequestAmino; } /** diff --git a/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts index 018c7ae8be..5a5f03443a 100644 --- a/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputv3/evmos/incentives/v1/query.ts @@ -195,10 +195,6 @@ export interface QueryGasMeterRequestSDKType { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: bigint; } export interface QueryGasMeterResponseProtoMsg { @@ -210,10 +206,6 @@ export interface QueryGasMeterResponseProtoMsg { * method. */ export interface QueryGasMeterResponseAmino { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gas_meter?: string; } /** diff --git a/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts index 0350063516..14dc9f97f6 100644 --- a/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputv3/google/protobuf/descriptor.ts @@ -30,6 +30,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -191,12 +192,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -388,6 +386,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; @@ -425,6 +424,7 @@ export interface FileDescriptorProtoProtoMsg { export interface FileDescriptorProtoAmino { /** file name, relative to root of source tree */ name?: string; + /** e.g. "foo", "foo.bar", etc. */ package?: string; /** Names of files imported by this file. */ dependency?: string[]; diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts index 60845471e5..f42b82f4a9 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/lock.ts @@ -53,7 +53,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: bigint; + iD: bigint; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -259,7 +259,7 @@ export interface SyntheticLockSDKType { } function createBasePeriodLock(): PeriodLock { return { - ID: BigInt(0), + iD: BigInt(0), owner: "", duration: Duration.fromPartial({}), endTime: new Date(), @@ -270,8 +270,8 @@ export const PeriodLock = { typeUrl: "/osmosis.lockup.PeriodLock", aminoType: "osmosis/lockup/period-lock", encode(message: PeriodLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== "") { writer.uint32(18).string(message.owner); @@ -295,7 +295,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 2: message.owner = reader.string(); @@ -318,7 +318,7 @@ export const PeriodLock = { }, fromJSON(object: any): PeriodLock { const obj = createBasePeriodLock(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.owner)) obj.owner = String(object.owner); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); if (isSet(object.endTime)) obj.endTime = new Date(object.endTime); @@ -327,8 +327,8 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.owner = object.owner ?? ""; if (object.duration !== undefined && object.duration !== null) { @@ -340,7 +340,7 @@ export const PeriodLock = { }, fromSDK(object: PeriodLockSDKType): PeriodLock { return { - ID: object?.ID, + iD: object?.ID, owner: object?.owner, duration: object.duration ? Duration.fromSDK(object.duration) : undefined, endTime: object.end_time ?? undefined, @@ -349,7 +349,7 @@ export const PeriodLock = { }, toSDK(message: PeriodLock): PeriodLockSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); message.endTime !== undefined && (obj.end_time = message.endTime ?? undefined); @@ -363,7 +363,7 @@ export const PeriodLock = { fromAmino(object: PeriodLockAmino): PeriodLock { const message = createBasePeriodLock(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.owner !== undefined && object.owner !== null) { message.owner = object.owner; @@ -379,7 +379,7 @@ export const PeriodLock = { }, toAmino(message: PeriodLock, useInterfaces: boolean = true): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; diff --git a/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts index 88a7f70c50..dd5a78a6b9 100644 --- a/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/lockup/tx.ts @@ -24,7 +24,7 @@ export interface MsgLockTokensSDKType { coins: CoinSDKType[]; } export interface MsgLockTokensResponse { - ID: bigint; + iD: bigint; } export interface MsgLockTokensResponseProtoMsg { typeUrl: "/osmosis.lockup.MsgLockTokensResponse"; @@ -64,7 +64,7 @@ export interface MsgBeginUnlockingAllResponseSDKType { } export interface MsgBeginUnlocking { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -102,7 +102,7 @@ export interface MsgBeginUnlockingResponseSDKType { */ export interface MsgExtendLockup { owner: string; - ID: bigint; + iD: bigint; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -154,7 +154,7 @@ export interface MsgExtendLockupResponseSDKType { */ export interface MsgForceUnlock { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -310,15 +310,15 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockTokensResponse = { typeUrl: "/osmosis.lockup.MsgLockTokensResponse", aminoType: "osmosis/lockup/lock-tokens-response", encode(message: MsgLockTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -330,7 +330,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -341,36 +341,36 @@ export const MsgLockTokensResponse = { }, fromJSON(object: any): MsgLockTokensResponse { const obj = createBaseMsgLockTokensResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockTokensResponseSDKType): MsgLockTokensResponse { return { - ID: object?.ID + iD: object?.ID }; }, toSDK(message: MsgLockTokensResponse): MsgLockTokensResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockTokensResponseAmino): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockTokensResponse, useInterfaces: boolean = true): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromProtoMsg(message: MsgLockTokensResponseProtoMsg, useInterfaces: boolean = true): MsgLockTokensResponse { @@ -547,7 +547,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -558,8 +558,8 @@ export const MsgBeginUnlocking = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -577,7 +577,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32(), useInterfaces)); @@ -592,15 +592,15 @@ export const MsgBeginUnlocking = { fromJSON(object: any): MsgBeginUnlocking { const obj = createBaseMsgBeginUnlocking(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -608,14 +608,14 @@ export const MsgBeginUnlocking = { fromSDK(object: MsgBeginUnlockingSDKType): MsgBeginUnlocking { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, toSDK(message: MsgBeginUnlocking): MsgBeginUnlockingSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -629,7 +629,7 @@ export const MsgBeginUnlocking = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -637,7 +637,7 @@ export const MsgBeginUnlocking = { toAmino(message: MsgBeginUnlocking, useInterfaces: boolean = true): MsgBeginUnlockingAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { @@ -737,7 +737,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), duration: Duration.fromPartial({}) }; } @@ -748,8 +748,8 @@ export const MsgExtendLockup = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -767,7 +767,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.duration = Duration.decode(reader, reader.uint32(), useInterfaces); @@ -782,15 +782,15 @@ export const MsgExtendLockup = { fromJSON(object: any): MsgExtendLockup { const obj = createBaseMsgExtendLockup(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); return obj; }, fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromPartial(object.duration); @@ -800,14 +800,14 @@ export const MsgExtendLockup = { fromSDK(object: MsgExtendLockupSDKType): MsgExtendLockup { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, duration: object.duration ? Duration.fromSDK(object.duration) : undefined }; }, toSDK(message: MsgExtendLockup): MsgExtendLockupSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; }, @@ -817,7 +817,7 @@ export const MsgExtendLockup = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromAmino(object.duration); @@ -827,7 +827,7 @@ export const MsgExtendLockup = { toAmino(message: MsgExtendLockup, useInterfaces: boolean = true): MsgExtendLockupAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration, useInterfaces) : undefined; return obj; }, @@ -923,7 +923,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -934,8 +934,8 @@ export const MsgForceUnlock = { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (message.ID !== BigInt(0)) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -953,7 +953,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32(), useInterfaces)); @@ -968,15 +968,15 @@ export const MsgForceUnlock = { fromJSON(object: any): MsgForceUnlock { const obj = createBaseMsgForceUnlock(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -984,14 +984,14 @@ export const MsgForceUnlock = { fromSDK(object: MsgForceUnlockSDKType): MsgForceUnlock { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, toSDK(message: MsgForceUnlock): MsgForceUnlockSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -1005,7 +1005,7 @@ export const MsgForceUnlock = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -1013,7 +1013,7 @@ export const MsgForceUnlock = { toAmino(message: MsgForceUnlock, useInterfaces: boolean = true): MsgForceUnlockAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e, useInterfaces) : undefined); } else { diff --git a/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts index f8b5c79aac..261c4391a9 100644 --- a/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputv3/osmosis/superfluid/tx.ts @@ -109,7 +109,7 @@ export interface MsgLockAndSuperfluidDelegateSDKType { val_addr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: bigint; + iD: bigint; } export interface MsgLockAndSuperfluidDelegateResponseProtoMsg { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse"; @@ -765,15 +765,15 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockAndSuperfluidDelegateResponse = { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse", aminoType: "osmosis/lock-and-superfluid-delegate-response", encode(message: MsgLockAndSuperfluidDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== BigInt(0)) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== BigInt(0)) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -785,7 +785,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -796,36 +796,36 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromJSON(object: any): MsgLockAndSuperfluidDelegateResponse { const obj = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockAndSuperfluidDelegateResponseSDKType): MsgLockAndSuperfluidDelegateResponse { return { - ID: object?.ID + iD: object?.ID }; }, toSDK(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockAndSuperfluidDelegateResponseAmino): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockAndSuperfluidDelegateResponse, useInterfaces: boolean = true): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromProtoMsg(message: MsgLockAndSuperfluidDelegateResponseProtoMsg, useInterfaces: boolean = true): MsgLockAndSuperfluidDelegateResponse { diff --git a/__fixtures__/v-next/outputv3/tendermint/abci/types.ts b/__fixtures__/v-next/outputv3/tendermint/abci/types.ts index 5d613b5b87..d32e57b364 100644 --- a/__fixtures__/v-next/outputv3/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputv3/tendermint/abci/types.ts @@ -1069,12 +1069,9 @@ export interface TxResultSDKType { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: bigint; } export interface ValidatorProtoMsg { @@ -1083,12 +1080,9 @@ export interface ValidatorProtoMsg { } /** Validator */ export interface ValidatorAmino { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address?: string; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power?: string; } /** Validator */ diff --git a/__fixtures__/v-next/outputv3/tendermint/types/types.ts b/__fixtures__/v-next/outputv3/tendermint/types/types.ts index 252ac6e2c2..1c83eeb866 100644 --- a/__fixtures__/v-next/outputv3/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputv3/tendermint/types/types.ts @@ -165,6 +165,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -174,6 +175,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array; @@ -195,6 +197,7 @@ export interface HeaderAmino { last_block_id?: BlockIDAmino; /** hashes of block data */ last_commit_hash?: string; + /** transactions */ data_hash?: string; /** hashes from the app output from the prev block */ validators_hash?: string; @@ -204,6 +207,7 @@ export interface HeaderAmino { consensus_hash?: string; /** state after txs from the previous block */ app_hash?: string; + /** root hash of all results from the txs from the previous block */ last_results_hash?: string; /** consensus info */ evidence_hash?: string; diff --git a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts index 432e61fd35..5d2ca29515 100644 --- a/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputv4/cosmwasm/wasm/v1/query.ts @@ -93,11 +93,9 @@ export interface QueryContractHistoryResponseSDKType { * RPC method */ export interface QueryContractsByCodeRequest { - /** - * grpc-gateway_out does not support Go style CodID - * pagination defines an optional pagination for the request. - */ + /** grpc-gateway_out does not support Go style CodID */ codeId: bigint; + /** pagination defines an optional pagination for the request. */ pagination?: PageRequest; } export interface QueryContractsByCodeRequestProtoMsg { diff --git a/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts index 5887fa38b4..d174759e36 100644 --- a/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputv4/evmos/incentives/v1/query.ts @@ -141,10 +141,6 @@ export interface QueryGasMeterRequestSDKType { * method. */ export interface QueryGasMeterResponse { - /** - * QueryGasMeterResponse is the response type for the Query/Incentive RPC - * method. - */ gasMeter: bigint; } export interface QueryGasMeterResponseProtoMsg { diff --git a/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts index d1a498056e..cc3e4cd465 100644 --- a/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputv4/google/protobuf/descriptor.ts @@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type { * treat group fields as unknown fields. */ TYPE_GROUP = 10, + /** TYPE_MESSAGE - Length-delimited aggregate. */ TYPE_MESSAGE = 11, /** TYPE_BYTES - New in version 2. */ TYPE_BYTES = 12, @@ -190,12 +191,9 @@ export function fieldDescriptorProto_LabelToJSON(object: FieldDescriptorProto_La } /** Generated classes can be optimized for speed or code size. */ export enum FileOptions_OptimizeMode { - /** - * SPEED - Generate complete code for parsing, serialization, - * etc. - */ + /** SPEED - Generate complete code for parsing, serialization, */ SPEED = 1, - /** CODE_SIZE - Use ReflectionOps to implement these methods. */ + /** CODE_SIZE - etc. */ CODE_SIZE = 2, /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */ LITE_RUNTIME = 3, @@ -376,6 +374,7 @@ export interface FileDescriptorSetSDKType { export interface FileDescriptorProto { /** file name, relative to root of source tree */ name: string; + /** e.g. "foo", "foo.bar", etc. */ package: string; /** Names of files imported by this file. */ dependency: string[]; diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts index 3df33d39a6..c2e80dd544 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/lock.ts @@ -53,7 +53,7 @@ export interface PeriodLock { * The ID of the lock is decided upon lock creation, incrementing by 1 for * every lock. */ - ID: bigint; + iD: bigint; /** * Owner is the account address of the lock owner. * Only the owner can modify the state of the lock. @@ -175,7 +175,7 @@ export interface SyntheticLockSDKType { } function createBasePeriodLock(): PeriodLock { return { - ID: BigInt(0), + iD: BigInt(0), owner: "", duration: Duration.fromPartial({}), endTime: new Date(), @@ -185,8 +185,8 @@ function createBasePeriodLock(): PeriodLock { export const PeriodLock = { typeUrl: "/osmosis.lockup.PeriodLock", encode(message: PeriodLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== undefined) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(8).uint64(message.iD); } if (message.owner !== undefined) { writer.uint32(18).string(message.owner); @@ -210,7 +210,7 @@ export const PeriodLock = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 2: message.owner = reader.string(); @@ -233,7 +233,7 @@ export const PeriodLock = { }, fromJSON(object: any): PeriodLock { const obj = createBasePeriodLock(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.owner)) obj.owner = String(object.owner); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); if (isSet(object.endTime)) obj.endTime = new Date(object.endTime); @@ -242,7 +242,7 @@ export const PeriodLock = { }, toJSON(message: PeriodLock): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.owner !== undefined && (obj.owner = message.owner); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); message.endTime !== undefined && (obj.endTime = message.endTime.toISOString()); @@ -255,8 +255,8 @@ export const PeriodLock = { }, fromPartial(object: DeepPartial): PeriodLock { const message = createBasePeriodLock(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.owner = object.owner ?? ""; if (object.duration !== undefined && object.duration !== null) { @@ -268,7 +268,7 @@ export const PeriodLock = { }, fromSDK(object: PeriodLockSDKType): PeriodLock { return { - ID: object?.ID, + iD: object?.ID, owner: object?.owner, duration: object.duration ? Duration.fromSDK(object.duration) : undefined, endTime: object.end_time ?? undefined, @@ -286,7 +286,7 @@ export const PeriodLock = { }, toSDK(message: PeriodLock): PeriodLockSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); message.endTime !== undefined && (obj.end_time = message.endTime ?? undefined); @@ -300,7 +300,7 @@ export const PeriodLock = { fromAmino(object: PeriodLockAmino): PeriodLock { const message = createBasePeriodLock(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.owner !== undefined && object.owner !== null) { message.owner = object.owner; @@ -316,7 +316,7 @@ export const PeriodLock = { }, toAmino(message: PeriodLock): PeriodLockAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.owner = message.owner === "" ? undefined : message.owner; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; obj.end_time = message.endTime ? Timestamp.toAmino(toTimestamp(message.endTime)) : undefined; diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/tx.amino.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/tx.amino.ts index cfbf972504..2165745e9e 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/tx.amino.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/tx.amino.ts @@ -113,12 +113,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/begin-unlock-period-lock", toAmino: ({ owner, - ID, + iD, coins }: MsgBeginUnlocking): MsgBeginUnlockingAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -132,7 +132,7 @@ export const AminoConverter = { }: MsgBeginUnlockingAminoType["value"]): MsgBeginUnlocking => { return { owner, - ID: BigInt(ID), + iD: BigInt(ID), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -144,12 +144,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/extend-lockup", toAmino: ({ owner, - ID, + iD, duration }: MsgExtendLockup): MsgExtendLockupAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), duration: (duration * 1_000_000_000).toString() }; }, @@ -160,7 +160,7 @@ export const AminoConverter = { }: MsgExtendLockupAminoType["value"]): MsgExtendLockup => { return { owner, - ID: BigInt(ID), + iD: BigInt(ID), duration: { seconds: BigInt(Math.floor(parseInt(duration) / 1_000_000_000)), nanos: parseInt(duration) % 1_000_000_000 @@ -172,12 +172,12 @@ export const AminoConverter = { aminoType: "osmosis/lockup/force-unlock", toAmino: ({ owner, - ID, + iD, coins }: MsgForceUnlock): MsgForceUnlockAminoType["value"] => { return { owner, - ID: ID.toString(), + ID: iD.toString(), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount @@ -191,7 +191,7 @@ export const AminoConverter = { }: MsgForceUnlockAminoType["value"]): MsgForceUnlock => { return { owner, - ID: BigInt(ID), + iD: BigInt(ID), coins: coins.map(el0 => ({ denom: el0.denom, amount: el0.amount diff --git a/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts index d018d280ba..c77af141fb 100644 --- a/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/lockup/tx.ts @@ -20,7 +20,7 @@ export interface MsgLockTokensSDKType { coins: CoinSDKType[]; } export interface MsgLockTokensResponse { - ID: bigint; + iD: bigint; } export interface MsgLockTokensResponseProtoMsg { typeUrl: "/osmosis.lockup.MsgLockTokensResponse"; @@ -51,7 +51,7 @@ export interface MsgBeginUnlockingAllResponseSDKType { } export interface MsgBeginUnlocking { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -80,7 +80,7 @@ export interface MsgBeginUnlockingResponseSDKType { */ export interface MsgExtendLockup { owner: string; - ID: bigint; + iD: bigint; /** * duration to be set. fails if lower than the current duration, or is * unlocking @@ -116,7 +116,7 @@ export interface MsgExtendLockupResponseSDKType { */ export interface MsgForceUnlock { owner: string; - ID: bigint; + iD: bigint; /** Amount of unlocking coins. Unlock all if not set. */ coins: Coin[]; } @@ -285,14 +285,14 @@ export const MsgLockTokens = { }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockTokensResponse = { typeUrl: "/osmosis.lockup.MsgLockTokensResponse", encode(message: MsgLockTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== undefined) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -304,7 +304,7 @@ export const MsgLockTokensResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -315,24 +315,24 @@ export const MsgLockTokensResponse = { }, fromJSON(object: any): MsgLockTokensResponse { const obj = createBaseMsgLockTokensResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, toJSON(message: MsgLockTokensResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockTokensResponseSDKType): MsgLockTokensResponse { return { - ID: object?.ID + iD: object?.ID }; }, fromSDKJSON(object: any): MsgLockTokensResponseSDKType { @@ -342,19 +342,19 @@ export const MsgLockTokensResponse = { }, toSDK(message: MsgLockTokensResponse): MsgLockTokensResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockTokensResponseAmino): MsgLockTokensResponse { const message = createBaseMsgLockTokensResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { @@ -580,7 +580,7 @@ export const MsgBeginUnlockingAllResponse = { function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -590,8 +590,8 @@ export const MsgBeginUnlocking = { if (message.owner !== undefined) { writer.uint32(10).string(message.owner); } - if (message.ID !== undefined) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -609,7 +609,7 @@ export const MsgBeginUnlocking = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -624,14 +624,14 @@ export const MsgBeginUnlocking = { fromJSON(object: any): MsgBeginUnlocking { const obj = createBaseMsgBeginUnlocking(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, toJSON(message: MsgBeginUnlocking): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -642,8 +642,8 @@ export const MsgBeginUnlocking = { fromPartial(object: DeepPartial): MsgBeginUnlocking { const message = createBaseMsgBeginUnlocking(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -651,7 +651,7 @@ export const MsgBeginUnlocking = { fromSDK(object: MsgBeginUnlockingSDKType): MsgBeginUnlocking { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, @@ -665,7 +665,7 @@ export const MsgBeginUnlocking = { toSDK(message: MsgBeginUnlocking): MsgBeginUnlockingSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -679,7 +679,7 @@ export const MsgBeginUnlocking = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -687,7 +687,7 @@ export const MsgBeginUnlocking = { toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { @@ -814,7 +814,7 @@ export const MsgBeginUnlockingResponse = { function createBaseMsgExtendLockup(): MsgExtendLockup { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), duration: Duration.fromPartial({}) }; } @@ -824,8 +824,8 @@ export const MsgExtendLockup = { if (message.owner !== undefined) { writer.uint32(10).string(message.owner); } - if (message.ID !== undefined) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(16).uint64(message.iD); } if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); @@ -843,7 +843,7 @@ export const MsgExtendLockup = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.duration = Duration.decode(reader, reader.uint32()); @@ -858,22 +858,22 @@ export const MsgExtendLockup = { fromJSON(object: any): MsgExtendLockup { const obj = createBaseMsgExtendLockup(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); return obj; }, toJSON(message: MsgExtendLockup): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); return obj; }, fromPartial(object: DeepPartial): MsgExtendLockup { const message = createBaseMsgExtendLockup(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromPartial(object.duration); @@ -883,7 +883,7 @@ export const MsgExtendLockup = { fromSDK(object: MsgExtendLockupSDKType): MsgExtendLockup { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, duration: object.duration ? Duration.fromSDK(object.duration) : undefined }; }, @@ -897,7 +897,7 @@ export const MsgExtendLockup = { toSDK(message: MsgExtendLockup): MsgExtendLockupSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; }, @@ -907,7 +907,7 @@ export const MsgExtendLockup = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } if (object.duration !== undefined && object.duration !== null) { message.duration = Duration.fromAmino(object.duration); @@ -917,7 +917,7 @@ export const MsgExtendLockup = { toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; return obj; }, @@ -1040,7 +1040,7 @@ export const MsgExtendLockupResponse = { function createBaseMsgForceUnlock(): MsgForceUnlock { return { owner: "", - ID: BigInt(0), + iD: BigInt(0), coins: [] }; } @@ -1050,8 +1050,8 @@ export const MsgForceUnlock = { if (message.owner !== undefined) { writer.uint32(10).string(message.owner); } - if (message.ID !== undefined) { - writer.uint32(16).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(16).uint64(message.iD); } for (const v of message.coins) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -1069,7 +1069,7 @@ export const MsgForceUnlock = { message.owner = reader.string(); break; case 2: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; case 3: message.coins.push(Coin.decode(reader, reader.uint32())); @@ -1084,14 +1084,14 @@ export const MsgForceUnlock = { fromJSON(object: any): MsgForceUnlock { const obj = createBaseMsgForceUnlock(); if (isSet(object.owner)) obj.owner = String(object.owner); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); if (Array.isArray(object?.coins)) obj.coins = object.coins.map((e: any) => Coin.fromJSON(e)); return obj; }, toJSON(message: MsgForceUnlock): JsonSafe { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -1102,8 +1102,8 @@ export const MsgForceUnlock = { fromPartial(object: DeepPartial): MsgForceUnlock { const message = createBaseMsgForceUnlock(); message.owner = object.owner ?? ""; - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } message.coins = object.coins?.map(e => Coin.fromPartial(e)) || []; return message; @@ -1111,7 +1111,7 @@ export const MsgForceUnlock = { fromSDK(object: MsgForceUnlockSDKType): MsgForceUnlock { return { owner: object?.owner, - ID: object?.ID, + iD: object?.ID, coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromSDK(e)) : [] }; }, @@ -1125,7 +1125,7 @@ export const MsgForceUnlock = { toSDK(message: MsgForceUnlock): MsgForceUnlockSDKType { const obj: any = {}; obj.owner = message.owner; - obj.ID = message.ID; + obj.ID = message.iD; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toSDK(e) : undefined); } else { @@ -1139,7 +1139,7 @@ export const MsgForceUnlock = { message.owner = object.owner; } if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } message.coins = object.coins?.map(e => Coin.fromAmino(e)) || []; return message; @@ -1147,7 +1147,7 @@ export const MsgForceUnlock = { toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { const obj: any = {}; obj.owner = message.owner === "" ? undefined : message.owner; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; if (message.coins) { obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); } else { diff --git a/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts index 6881754ce6..02a2b2bbae 100644 --- a/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputv4/osmosis/superfluid/tx.ts @@ -84,7 +84,7 @@ export interface MsgLockAndSuperfluidDelegateSDKType { val_addr: string; } export interface MsgLockAndSuperfluidDelegateResponse { - ID: bigint; + iD: bigint; } export interface MsgLockAndSuperfluidDelegateResponseProtoMsg { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse"; @@ -853,14 +853,14 @@ export const MsgLockAndSuperfluidDelegate = { }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { return { - ID: BigInt(0) + iD: BigInt(0) }; } export const MsgLockAndSuperfluidDelegateResponse = { typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse", encode(message: MsgLockAndSuperfluidDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ID !== undefined) { - writer.uint32(8).uint64(message.ID); + if (message.iD !== undefined) { + writer.uint32(8).uint64(message.iD); } return writer; }, @@ -872,7 +872,7 @@ export const MsgLockAndSuperfluidDelegateResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ID = reader.uint64(); + message.iD = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -883,24 +883,24 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, fromJSON(object: any): MsgLockAndSuperfluidDelegateResponse { const obj = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (isSet(object.ID)) obj.ID = BigInt(object.ID.toString()); + if (isSet(object.iD)) obj.iD = BigInt(object.iD.toString()); return obj; }, toJSON(message: MsgLockAndSuperfluidDelegateResponse): JsonSafe { const obj: any = {}; - message.ID !== undefined && (obj.ID = (message.ID || BigInt(0)).toString()); + message.iD !== undefined && (obj.iD = (message.iD || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); - if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID.toString()); + if (object.iD !== undefined && object.iD !== null) { + message.iD = BigInt(object.iD.toString()); } return message; }, fromSDK(object: MsgLockAndSuperfluidDelegateResponseSDKType): MsgLockAndSuperfluidDelegateResponse { return { - ID: object?.ID + iD: object?.ID }; }, fromSDKJSON(object: any): MsgLockAndSuperfluidDelegateResponseSDKType { @@ -910,19 +910,19 @@ export const MsgLockAndSuperfluidDelegateResponse = { }, toSDK(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseSDKType { const obj: any = {}; - obj.ID = message.ID; + obj.ID = message.iD; return obj; }, fromAmino(object: MsgLockAndSuperfluidDelegateResponseAmino): MsgLockAndSuperfluidDelegateResponse { const message = createBaseMsgLockAndSuperfluidDelegateResponse(); if (object.ID !== undefined && object.ID !== null) { - message.ID = BigInt(object.ID); + message.iD = BigInt(object.ID); } return message; }, toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { const obj: any = {}; - obj.ID = message.ID !== BigInt(0) ? message.ID.toString() : undefined; + obj.ID = message.iD !== BigInt(0) ? message.iD.toString() : undefined; return obj; }, fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { diff --git a/__fixtures__/v-next/outputv4/tendermint/abci/types.ts b/__fixtures__/v-next/outputv4/tendermint/abci/types.ts index eec5ae39cb..ccfe273b02 100644 --- a/__fixtures__/v-next/outputv4/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputv4/tendermint/abci/types.ts @@ -824,12 +824,9 @@ export interface TxResultSDKType { } /** Validator */ export interface Validator { - /** - * The first 20 bytes of SHA256(public key) - * PubKey pub_key = 2 [(gogoproto.nullable)=false]; - */ + /** The first 20 bytes of SHA256(public key) */ address: Uint8Array; - /** The voting power */ + /** PubKey pub_key = 2 [(gogoproto.nullable)=false]; */ power: bigint; } export interface ValidatorProtoMsg { diff --git a/__fixtures__/v-next/outputv4/tendermint/types/types.ts b/__fixtures__/v-next/outputv4/tendermint/types/types.ts index 7b97488080..2f4bfd4615 100644 --- a/__fixtures__/v-next/outputv4/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputv4/tendermint/types/types.ts @@ -149,6 +149,7 @@ export interface Header { lastBlockId: BlockID; /** hashes of block data */ lastCommitHash: Uint8Array; + /** transactions */ dataHash: Uint8Array; /** hashes from the app output from the prev block */ validatorsHash: Uint8Array; @@ -158,6 +159,7 @@ export interface Header { consensusHash: Uint8Array; /** state after txs from the previous block */ appHash: Uint8Array; + /** root hash of all results from the txs from the previous block */ lastResultsHash: Uint8Array; /** consensus info */ evidenceHash: Uint8Array;